Merge pull request #355 from SeeSharpSoft/fb_version_dependent_build

Fb version dependent build

Author: SeeSharpSoft

.github/workflows/PublishStable.yml

@@ -12,6 +12,15 @@ jobs:
 
     runs-on: ubuntu-latest
 
+    strategy:
+      fail-fast: false
+      matrix:
+        include:
+          - ideaVersion: IC-2022.1.1
+            gkVersion: 2021.1.2
+          - ideaVersion: IC-2022.2.1
+            gkVersion: 2021.1.2
+
     steps:
     - uses: actions/checkout@v2
     - name: Set up JDK 17
@@ -23,8 +32,9 @@ jobs:
       run: chmod +x gradlew
     - name: Build with Gradle
       env:
-        IDEA_VERSION: IU-2022.1.1
-        GRAMMAR_KIT_VERSION: 2021.1.2
+
+        IDEA_VERSION: ${{ matrix.ideaVersion }}
+        GRAMMAR_KIT_VERSION: ${{ matrix.gkVersion }}
         IDEA_SOURCES: false
         JI_CHANNELS: Stable
         JI_TOKEN: ${{ secrets.JI_TOKEN }}

build.gradle

@@ -19,7 +19,6 @@ jacocoTestReport {
 }
 
 group 'net.seesharpsoft.intellij.plugins'
-version '3.0.0'
 
 apply plugin: 'java'
 project.sourceCompatibility = JavaVersion.VERSION_11
@@ -67,20 +66,30 @@ idea {
     }
 }
 
+var final EAP_VERSION = 'LATEST-EAP-SNAPSHOT';
+// IDE version - https://www.jetbrains.com/intellij-repository/releases
+var idea_version = System.getenv().getOrDefault('IDEA_VERSION', 'IC-2022.1.1')
+var build_version = idea_version == EAP_VERSION ? idea_version : idea_version.substring(5, 7) + idea_version.charAt(8) // extract e.g. '221' from 'IC-2022.1.1'
+
+version '3.0.0-' + build_version
+
 apply plugin: 'org.jetbrains.intellij'
 intellij {
-    // IDE version - https://www.jetbrains.com/intellij-repository/releases
-    version = System.getenv().getOrDefault('IDEA_VERSION', 'IC-2022.1.1')
+    version = idea_version
     pluginName = 'CSV'
-    updateSinceUntilBuild = false
+    updateSinceUntilBuild = true
     downloadSources = Boolean.parseBoolean(System.getenv().getOrDefault('IDEA_SOURCES', "true"))
 
     plugins = [
-            System.getenv().getOrDefault('GIT_PLUGIN_VERSION', 'Git4Idea'),
-            System.getenv().getOrDefault('GITHUB_PLUGIN_VERSION', 'org.jetbrains.plugins.github')
+            'Git4Idea',
+            'org.jetbrains.plugins.github'
     ]
 }
 patchPluginXml {
+    // see http://www.jetbrains.org/intellij/sdk/docs/basics/getting_started/build_number_ranges.html for description
+    sinceBuild = build_version == EAP_VERSION ? '221' : build_version
+    untilBuild = build_version == EAP_VERSION ? '*' : build_version + ".*"
+
     changeNotes = """<pre style="font-family: sans-serif">
 Major update release 3.*!
 

src/main/java/net/seesharpsoft/intellij/plugins/csv/CsvPlugin.java

@@ -1,9 +1,9 @@
 package net.seesharpsoft.intellij.plugins.csv;
 
+import com.intellij.ide.BrowserUtil;
 import com.intellij.ide.actions.ShowSettingsUtilImpl;
 import com.intellij.ide.plugins.IdeaPluginDescriptor;
 import com.intellij.ide.plugins.PluginManagerCore;
-import com.intellij.ide.ui.IdeUiService;
 import com.intellij.notification.*;
 import com.intellij.openapi.extensions.PluginId;
 import com.intellij.openapi.options.ShowSettingsUtil;
@@ -37,7 +37,7 @@ private static void openLink(Project project, String link) {
         if (link.startsWith("#")) {
             ((ShowSettingsUtilImpl) ShowSettingsUtil.getInstance()).showSettingsDialog(project, link.substring(1), null);
         } else {
-            IdeUiService.getInstance().browse(link);
+            BrowserUtil.browse(link);
         }
     }
 

src/main/java/net/seesharpsoft/intellij/plugins/csv/editor/table/CsvTableEditor.java

@@ -8,7 +8,6 @@
 import com.intellij.openapi.editor.colors.EditorFontType;
 import com.intellij.openapi.fileEditor.*;
 import com.intellij.openapi.project.Project;
-import com.intellij.openapi.util.CheckedDisposable;
 import com.intellij.openapi.util.Key;
 import com.intellij.openapi.util.UserDataHolder;
 import com.intellij.openapi.util.UserDataHolderBase;
@@ -32,7 +31,7 @@
 import java.util.Arrays;
 import java.util.Collection;
 
-public abstract class CsvTableEditor implements FileEditor, FileEditorLocation, CheckedDisposable, PsiFileHolder {
+public abstract class CsvTableEditor implements FileEditor, FileEditorLocation, PsiFileHolder {
 
     public static final String EDITOR_NAME = "Table Editor";
 
@@ -190,7 +189,6 @@ public void dispose() {
         getTableModel().dispose();
     }
 
-    @Override
     public boolean isDisposed() {
         return this.myDisposed;
     }

src/main/java/net/seesharpsoft/intellij/plugins/csv/editor/table/swing/CsvTableEditorActionListeners.java

@@ -1,16 +1,14 @@
 package net.seesharpsoft.intellij.plugins.csv.editor.table.swing;
 
+import com.intellij.ide.BrowserUtil;
 import com.intellij.openapi.fileEditor.FileEditorManager;
 import com.intellij.openapi.fileEditor.OpenFileDescriptor;
 import com.intellij.ui.components.labels.LinkLabel;
 import com.intellij.ui.components.labels.LinkListener;
 import net.seesharpsoft.intellij.plugins.csv.editor.table.CsvTableActions;
 
 import javax.swing.*;
-import java.awt.*;
 import java.awt.event.ActionListener;
-import java.io.IOException;
-import java.net.URI;
 import java.util.Arrays;
 import java.util.stream.Collectors;
 
@@ -173,16 +171,7 @@ public void linkSelected(LinkLabel linkLabel, Object o) {
     private final class OpenCsvPluginLink implements LinkListener {
         @Override
         public void linkSelected(LinkLabel linkLabel, Object o) {
-            if (Desktop.isDesktopSupported()) {
-                Desktop desktop = Desktop.getDesktop();
-                if (desktop.isSupported(Desktop.Action.BROWSE)) {
-                    try {
-                        desktop.browse(URI.create("https://github.com/SeeSharpSoft/intellij-csv-validator"));
-                    } catch (IOException e) {
-                        e.printStackTrace();
-                    }
-                }
-            }
+            BrowserUtil.browse("https://github.com/SeeSharpSoft/intellij-csv-validator");
         }
     }
 }

src/main/java/net/seesharpsoft/intellij/plugins/csv/formatter/CsvFormattingModelBuilder.java

@@ -39,14 +39,17 @@ private static SpacingBuilder createSpaceBuilder(CodeStyleSettings settings) {
         return builder;
     }
 
+    private static ExternalFormattingModelBuilderImpl DUMMY_FORMATTING_MODEL_PROVIDER = new ExternalFormattingModelBuilderImpl(null);
+
     @Override
     @NotNull
     public FormattingModel createModel(FormattingContext formattingContext) {
         switch (formattingContext.getFormattingMode()) {
             case ADJUST_INDENT:
             case ADJUST_INDENT_ON_ENTER:
                 // do not care about indent during editing (baaad performance)
-                return FormatterImpl.getInstance().createDummyFormattingModel(formattingContext.getPsiElement());
+                // NOTE: Formatter.getInstance().createDummyFormattingModel(formattingContext.getPsiElement()); <-- marked as internal, but this DummyFormattingModel is all I want
+                return DUMMY_FORMATTING_MODEL_PROVIDER.createModel(formattingContext);
             case REFORMAT:
                 PsiElement element = formattingContext.getPsiElement();
                 CodeStyleSettings settings = formattingContext.getCodeStyleSettings();

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

@@ -45,9 +45,6 @@
         </p>
     ]]></description>
 
-    <!-- please see http://www.jetbrains.org/intellij/sdk/docs/basics/getting_started/build_number_ranges.html for description -->
-    <idea-version since-build="221" />
-
     <!-- please see http://www.jetbrains.org/intellij/sdk/docs/basics/getting_started/plugin_compatibility.html on how to target different products -->
     <depends>com.intellij.modules.lang</depends>
     <depends optional="true" config-file="withGithub.xml">org.jetbrains.plugins.github</depends>