From c448cfa106e460df9fee75abcd23e70baac5be78 Mon Sep 17 00:00:00 2001 From: marhali Date: Sat, 3 Sep 2022 15:42:34 +0200 Subject: [PATCH 1/5] remove deprecated function call --- .../marhali/easyi18n/service/TranslatorToolWindowFactory.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/de/marhali/easyi18n/service/TranslatorToolWindowFactory.java b/src/main/java/de/marhali/easyi18n/service/TranslatorToolWindowFactory.java index 3bbfd23..fd981cb 100644 --- a/src/main/java/de/marhali/easyi18n/service/TranslatorToolWindowFactory.java +++ b/src/main/java/de/marhali/easyi18n/service/TranslatorToolWindowFactory.java @@ -28,7 +28,7 @@ public class TranslatorToolWindowFactory implements ToolWindowFactory, DumbAware @Override public void createToolWindowContent(@NotNull Project project, @NotNull ToolWindow toolWindow) { InstanceManager manager = InstanceManager.get(project); - ContentFactory contentFactory = ContentFactory.SERVICE.getInstance(); + ContentFactory contentFactory = ContentFactory.getInstance(); // Translations tree view TreeView treeView = new TreeView(project); From 81fe2e7852b702926e11f6205b083362c38e04f8 Mon Sep 17 00:00:00 2001 From: marhali Date: Sat, 3 Sep 2022 16:18:23 +0200 Subject: [PATCH 2/5] fix folding for html parts Resolves #175 --- CHANGELOG.md | 10 ++++--- gradle.properties | 2 +- .../META-INF/de.marhali.easyi18n-html.xml | 13 +++++++++ .../META-INF/de.marhali.easyi18n-vue.xml | 27 ------------------- src/main/resources/META-INF/plugin.xml | 2 +- 5 files changed, 21 insertions(+), 33 deletions(-) create mode 100644 src/main/resources/META-INF/de.marhali.easyi18n-html.xml delete mode 100644 src/main/resources/META-INF/de.marhali.easyi18n-vue.xml diff --git a/CHANGELOG.md b/CHANGELOG.md index a8ccc92..8589ddd 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,13 +3,15 @@ # easy-i18n Changelog ## [Unreleased] +### Fixed +- Folding support for Vue files ## [4.2.2] -### Changed -- Documentation provider better focuses on the actual translation part -- Color duplicate translation values orange to increase contrast in light themes +### Changed +- Documentation provider better focuses on the actual translation part +- Color duplicate translation values orange to increase contrast in light themes -### Fixed +### Fixed - Unintended overwrite of existing folding regions ## [4.2.1] diff --git a/gradle.properties b/gradle.properties index f24aece..d2e3921 100644 --- a/gradle.properties +++ b/gradle.properties @@ -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 diff --git a/src/main/resources/META-INF/de.marhali.easyi18n-html.xml b/src/main/resources/META-INF/de.marhali.easyi18n-html.xml new file mode 100644 index 0000000..af05de4 --- /dev/null +++ b/src/main/resources/META-INF/de.marhali.easyi18n-html.xml @@ -0,0 +1,13 @@ + + + + + + + \ No newline at end of file diff --git a/src/main/resources/META-INF/de.marhali.easyi18n-vue.xml b/src/main/resources/META-INF/de.marhali.easyi18n-vue.xml deleted file mode 100644 index 3342f16..0000000 --- a/src/main/resources/META-INF/de.marhali.easyi18n-vue.xml +++ /dev/null @@ -1,27 +0,0 @@ - - - - - - - - - \ No newline at end of file diff --git a/src/main/resources/META-INF/plugin.xml b/src/main/resources/META-INF/plugin.xml index 4db7d2f..45f9611 100644 --- a/src/main/resources/META-INF/plugin.xml +++ b/src/main/resources/META-INF/plugin.xml @@ -11,8 +11,8 @@ org.jetbrains.kotlin JavaScript + com.intellij.modules.xml com.intellij.java - org.jetbrains.plugins.vue com.jetbrains.php From 7fd65264055958905e99376869e8ce4c86501b07 Mon Sep 17 00:00:00 2001 From: marhali Date: Sat, 3 Sep 2022 16:38:48 +0200 Subject: [PATCH 3/5] remove warning about missing configuration during project init Resolves #148 --- CHANGELOG.md | 3 +++ src/main/java/de/marhali/easyi18n/DataStore.java | 4 +--- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 8589ddd..3d3cdd6 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,9 @@ # easy-i18n Changelog ## [Unreleased] +### Changed +- Removed warning about missing configuration during project initialization + ### Fixed - Folding support for Vue files diff --git a/src/main/java/de/marhali/easyi18n/DataStore.java b/src/main/java/de/marhali/easyi18n/DataStore.java index 2d9a12b..b335c88 100644 --- a/src/main/java/de/marhali/easyi18n/DataStore.java +++ b/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) { - NotificationHelper.createEmptyLocalesDirNotification(project); - } else { + if(!(ex instanceof EmptyLocalesDirException)) { NotificationHelper.createIOError(settings, ex); } } From 38ab3f62d5260f6877727c5b81ee4b732331e0ea Mon Sep 17 00:00:00 2001 From: marhali Date: Sat, 3 Sep 2022 16:55:49 +0200 Subject: [PATCH 4/5] prepare patch release --- gradle.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle.properties b/gradle.properties index d2e3921..dda8cb0 100644 --- a/gradle.properties +++ b/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. From 6858590235bbf5c3ccd0dc94cec1f0b61b82896f Mon Sep 17 00:00:00 2001 From: marhali Date: Sat, 3 Sep 2022 17:18:53 +0200 Subject: [PATCH 5/5] rollback to deprecated function call --- .../marhali/easyi18n/service/TranslatorToolWindowFactory.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/de/marhali/easyi18n/service/TranslatorToolWindowFactory.java b/src/main/java/de/marhali/easyi18n/service/TranslatorToolWindowFactory.java index fd981cb..3bbfd23 100644 --- a/src/main/java/de/marhali/easyi18n/service/TranslatorToolWindowFactory.java +++ b/src/main/java/de/marhali/easyi18n/service/TranslatorToolWindowFactory.java @@ -28,7 +28,7 @@ public class TranslatorToolWindowFactory implements ToolWindowFactory, DumbAware @Override public void createToolWindowContent(@NotNull Project project, @NotNull ToolWindow toolWindow) { InstanceManager manager = InstanceManager.get(project); - ContentFactory contentFactory = ContentFactory.getInstance(); + ContentFactory contentFactory = ContentFactory.SERVICE.getInstance(); // Translations tree view TreeView treeView = new TreeView(project);