Merge pull request #181 from marhali/next

Next

CHANGELOG.md

@@ -3,13 +3,18 @@
 # easy-i18n Changelog
 
 ## [Unreleased]
+### Changed
+- Removed warning about missing configuration during project initialization
+
+### Fixed
+- Folding support for Vue files
 
 ## [4.2.2]
-### Changed
+### Changed
-- Documentation provider better focuses on the actual translation part
+- Documentation provider better focuses on the actual translation part
-- Color duplicate translation values orange to increase contrast in light themes
+- Color duplicate translation values orange to increase contrast in light themes
 
-### Fixed
+### Fixed
 - Unintended overwrite of existing folding regions
 
 ## [4.2.1]

gradle.properties

@@ -4,7 +4,7 @@
 pluginGroup = de.marhali.easyi18n
 pluginName = easy-i18n
 # SemVer format -> https://semver.org
-pluginVersion = 4.2.2
+pluginVersion = 4.2.3
 
 # See https://plugins.jetbrains.com/docs/intellij/build-number-ranges.html
 # for insight into build numbers and IntelliJ Platform versions.
@@ -17,7 +17,7 @@ platformVersion = 2022.2
 
 # Plugin Dependencies -> https://plugins.jetbrains.com/docs/intellij/plugin-dependencies.html
 # Example: platformPlugins = com.intellij.java, com.jetbrains.php:203.4449.22
-platformPlugins = org.jetbrains.kotlin, JavaScriptLanguage, org.jetbrains.plugins.vue:222.3345.111, com.jetbrains.php:222.3345.118
+platformPlugins = org.jetbrains.kotlin, JavaScriptLanguage, com.jetbrains.php:222.3345.118
 
 # Gradle Releases -> https://github.com/gradle/gradle/releases
 gradleVersion = 7.5.1

src/main/java/de/marhali/easyi18n/DataStore.java

@@ -62,9 +62,7 @@ public class DataStore {
                 this.data = new TranslationData(settings.isSorting());
                 successResult.accept(false);
 
-                if(ex instanceof EmptyLocalesDirException) {
+                if(!(ex instanceof EmptyLocalesDirException)) {
-                    NotificationHelper.createEmptyLocalesDirNotification(project);
-                } else {
                     NotificationHelper.createIOError(settings, ex);
                 }
             }

src/main/resources/META-INF/de.marhali.easyi18n-html.xml

@@ -0,0 +1,13 @@
+<idea-plugin>
+    <extensions defaultExtensionNs="com.intellij">
+        <lang.foldingBuilder
+                language="HTML"
+                implementationClass="de.marhali.easyi18n.assistance.folding.JsFoldingBuilder"
+        />
+
+        <lang.documentationProvider
+                language="HTML"
+                implementationClass="de.marhali.easyi18n.assistance.documentation.CommonDocumentationProvider"
+        />
+    </extensions>
+</idea-plugin>

src/main/resources/META-INF/de.marhali.easyi18n-vue.xml

@@ -1,27 +0,0 @@
-<idea-plugin>
-    <extensions defaultExtensionNs="com.intellij">
-        <!--
-        Extending folding in Vue files breaks the entire section folding functionality
-        An issue has been opened: https://youtrack.jetbrains.com/issue/IJSDK-1525
-        <lang.foldingBuilder
-                language="VueJS"
-                implementationClass="de.marhali.easyi18n.assistance.folding.JsFoldingBuilder"
-        />
-
-        <lang.foldingBuilder
-                language="Vue"
-                implementationClass="de.marhali.easyi18n.assistance.folding.JsFoldingBuilder"
-        />
-        -->
-
-        <lang.documentationProvider
-                language="VueJS"
-                implementationClass="de.marhali.easyi18n.assistance.documentation.CommonDocumentationProvider"
-        />
-
-        <lang.documentationProvider
-                language="Vue"
-                implementationClass="de.marhali.easyi18n.assistance.documentation.CommonDocumentationProvider"
-        />
-    </extensions>
-</idea-plugin>

src/main/resources/META-INF/plugin.xml

@@ -11,8 +11,8 @@
 
     <depends optional="true" config-file="de.marhali.easyi18n-kotlin.xml">org.jetbrains.kotlin</depends>
     <depends optional="true" config-file="de.marhali.easyi18n-javascript.xml">JavaScript</depends>
+    <depends optional="true" config-file="de.marhali.easyi18n-html.xml">com.intellij.modules.xml</depends>
     <depends optional="true" config-file="de.marhali.easyi18n-java.xml">com.intellij.java</depends>
-    <depends optional="true" config-file="de.marhali.easyi18n-vue.xml">org.jetbrains.plugins.vue</depends>
     <depends optional="true" config-file="de.marhali.easyi18n-php.xml">com.jetbrains.php</depends>
 
     <actions>