Merge pull request NixOS#22 from JojOatXGME/idea203

JojOatXGME · Jan 5, 2021 · d332de0 · d332de0
2 parents ca3dd6c + 3f32ecb
commit d332de0
Show file tree

Hide file tree

Showing 9 changed files with 45 additions and 43 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,6 +1,11 @@
 # Changelog
 
 ## [Unreleased]
+### Added
+- Support for IDEA 2020.3
+### Removed
+- Support for IDEA 2019.3
+## [0.3.0.3]
 ### Fixed
 - Change ID of plugin back from `org.nixos.idea` in version 0.3.0.0 to
   `nix-idea` from earlier versions. The different ID of version 0.3.0.0

diff --git a/build.gradle.kts b/build.gradle.kts
@@ -7,11 +7,11 @@ plugins {
     // Java support
     id("java")
     // gradle-intellij-plugin - read more: https://github.com/JetBrains/gradle-intellij-plugin
-    id("org.jetbrains.intellij") version "0.4.21"
+    id("org.jetbrains.intellij") version "0.6.5"
     // gradle-changelog-plugin - read more: https://github.com/JetBrains/gradle-changelog-plugin
-    id("org.jetbrains.changelog") version "0.4.0"
+    id("org.jetbrains.changelog") version "0.6.2"
     // grammarkit - read more: https://github.com/JetBrains/gradle-grammar-kit-plugin
-    id("org.jetbrains.grammarkit") version "2020.1"
+    id("org.jetbrains.grammarkit") version "2020.3.2"
 }
 
 // Import variables from gradle.properties file
@@ -20,6 +20,7 @@ val pluginName: String by project
 val pluginVersion: String by project
 val pluginSinceBuild: String by project
 val pluginUntilBuild: String by project
+val pluginVerifierIdeVersions: String by project
 
 val platformType: String by project
 val platformVersion: String by project
@@ -43,6 +44,10 @@ intellij {
     updateSinceUntilBuild = true
 }
 
+changelog {
+    headerParserRegex = "^[-._+0-9a-zA-Z]+\$"
+}
+
 grammarKit {
     // version of IntelliJ patched JFlex (see bintray link below), Default is 1.7.0-1
     jflexRelease = "1.7.0-1"
@@ -127,6 +132,10 @@ tasks {
         )
     }
 
+    runPluginVerifier {
+        ideVersions(pluginVerifierIdeVersions)
+    }
+
     publishPlugin {
         token(System.getenv("JETBRAINS_TOKEN"))
         channels(pluginVersion.split('-').getOrElse(1) { "default" }.split('.').first())

diff --git a/gradle.properties b/gradle.properties
@@ -3,9 +3,12 @@
 
 pluginGroup = org.nixos.idea
 pluginName = NixIDEA
-pluginVersion = 0.3.0.3
-pluginSinceBuild = 193
-pluginUntilBuild = 202.*
+pluginVersion = 0.3.0.4
+pluginSinceBuild = 201
+pluginUntilBuild = 203.*
+# Plugin Verifier integration -> https://github.com/JetBrains/gradle-intellij-plugin#plugin-verifier-dsl
+# See https://jb.gg/intellij-platform-builds-list for available build versions
+pluginVerifierIdeVersions = 2020.1.4, 2020.2.3, 2020.3.1
 
 platformType = IC
 platformVersion = 2020.1

diff --git a/src/main/java/org/nixos/idea/file/NixFileType.java b/src/main/java/org/nixos/idea/file/NixFileType.java
@@ -11,14 +11,6 @@
 public class NixFileType extends LanguageFileType {
 
     public static final NixFileType INSTANCE = new NixFileType();
-    public static final NixFileType SHELL = new NixFileType();
-    public static final NixFileType RELEASE = new NixFileType();
-    public static final NixFileType NIXOS_MODULE = new NixFileType();
-    public static final NixFileType SIMPLE_STDENV_PKG = new NixFileType();
-    public static final NixFileType NIXOPS_INFRA = new NixFileType();
-    public static final NixFileType DISNIX_SERVICE_MAPPING = new NixFileType();
-    public static final NixFileType DISNIX_INFRA = new NixFileType();
-    public static final NixFileType DISNIX_DEPLOY = new NixFileType();
 
     private NixFileType() {
         super(NixLanguage.INSTANCE);

diff --git a/src/main/java/org/nixos/idea/file/NixFileTypeFactory.java b/src/main/java/org/nixos/idea/file/NixFileTypeFactory.java
diff --git a/src/main/java/org/nixos/idea/icon/NixIcons.java b/src/main/java/org/nixos/idea/icon/NixIcons.java
@@ -5,5 +5,5 @@
 import javax.swing.*;
 
 public class NixIcons {
-    public static final Icon FILE = IconLoader.getIcon("/org/nixos/idea/icon/nixos-icon.png");
+    public static final Icon FILE = IconLoader.getIcon("/org/nixos/idea/icon/nixos-icon.png", NixIcons.class);
 }
diff --git a/src/main/java/org/nixos/idea/lang/NixParserDefinition.java b/src/main/java/org/nixos/idea/lang/NixParserDefinition.java
@@ -1,6 +1,5 @@
 package org.nixos.idea.lang;
 
-import org.nixos.idea.file.NixFile;
 import com.intellij.lang.ASTNode;
 import com.intellij.lang.Language;
 import com.intellij.lang.ParserDefinition;
@@ -14,9 +13,9 @@
 import com.intellij.psi.TokenType;
 import com.intellij.psi.tree.IFileElementType;
 import com.intellij.psi.tree.TokenSet;
-import org.nixos.idea.lang.NixParser;
-import org.nixos.idea.psi.NixTypes;
 import org.jetbrains.annotations.NotNull;
+import org.nixos.idea.file.NixFile;
+import org.nixos.idea.psi.NixTypes;
 
 import java.io.Reader;
 
@@ -35,21 +34,25 @@ public Lexer createLexer(Project project) {
     }
 
     @NotNull
+    @Override
     public TokenSet getWhitespaceTokens() {
         return WHITE_SPACES;
     }
 
     @NotNull
+    @Override
     public TokenSet getCommentTokens() {
         return COMMENTS;
     }
 
     @NotNull
+    @Override
     public TokenSet getStringLiteralElements() {
         return STRING_LITERALS;
     }
 
     @NotNull
+    @Override
     public PsiParser createParser(final Project project) {
         return new NixParser();
     }
@@ -59,15 +62,18 @@ public IFileElementType getFileNodeType() {
         return FILE;
     }
 
+    @Override
     public PsiFile createFile(FileViewProvider viewProvider) {
         return new NixFile(viewProvider);
     }
 
-    public SpaceRequirements spaceExistanceTypeBetweenTokens(ASTNode left, ASTNode right) {
+    @Override
+    public SpaceRequirements spaceExistenceTypeBetweenTokens(ASTNode left, ASTNode right) {
         return SpaceRequirements.MAY;
     }
 
     @NotNull
+    @Override
     public PsiElement createElement(ASTNode node) {
         return NixTypes.Factory.createElement(node);
     }

diff --git a/src/main/java/org/nixos/idea/lang/NixSyntaxHighlighter.java b/src/main/java/org/nixos/idea/lang/NixSyntaxHighlighter.java
@@ -1,17 +1,14 @@
 package org.nixos.idea.lang;
 
-import org.nixos.idea.psi.NixTypes;
-import com.intellij.openapi.editor.DefaultLanguageHighlighterColors;
-import com.intellij.openapi.fileTypes.SyntaxHighlighterBase;
-
-import com.intellij.lexer.FlexAdapter;
 import com.intellij.lexer.Lexer;
+import com.intellij.openapi.editor.DefaultLanguageHighlighterColors;
 import com.intellij.openapi.editor.colors.TextAttributesKey;
+import com.intellij.openapi.fileTypes.SyntaxHighlighterBase;
 import com.intellij.psi.tree.IElementType;
 import org.jetbrains.annotations.NotNull;
+import org.nixos.idea.psi.NixTypes;
 
-import java.io.Reader;
-
+import static com.intellij.openapi.editor.colors.TextAttributesKey.EMPTY_ARRAY;
 import static com.intellij.openapi.editor.colors.TextAttributesKey.createTextAttributesKey;
 
 public class NixSyntaxHighlighter extends SyntaxHighlighterBase {
@@ -187,7 +184,7 @@ public TextAttributesKey[] getTokenHighlights(IElementType tokenType) {
                     tokenType == NixTypes.REQUIRES) {
                 return KEYWORD_KEYS;
             }
-            return EMPTY;
+            return EMPTY_ARRAY;
         }
     }
 }

diff --git a/src/main/resources/META-INF/plugin.xml b/src/main/resources/META-INF/plugin.xml
@@ -4,14 +4,16 @@
     <name>NixIDEA</name>
     <vendor>NixOS</vendor>
 
-    <idea-version since-build="202" />
-
     <depends>com.intellij.modules.lang</depends>
 
     <extensions defaultExtensionNs="com.intellij">
 
-        <fileTypeFactory
-                implementation="org.nixos.idea.file.NixFileTypeFactory" />
+        <fileType
+                name="Nix file"
+                implementationClass="org.nixos.idea.file.NixFileType"
+                fieldName="INSTANCE"
+                language="Nix"
+                extensions="nix" />
 
         <lang.parserDefinition
                 language="Nix"