Merge pull request #25 from Saberos/master

CHANGELOG.md

@@ -2,6 +2,9 @@
 
 ## [Unreleased]
 ### Added
+- Support line comment and block comment IDEA actions
+## [0.3.0.4]
+### Added
 - Support for IDEA 2020.3
 ### Removed
 - Support for IDEA 2019.3

gradle.properties

@@ -3,7 +3,7 @@
 
 pluginGroup = org.nixos.idea
 pluginName = NixIDEA
-pluginVersion = 0.3.0.4
+pluginVersion = 0.3.0.5
 pluginSinceBuild = 201
 pluginUntilBuild = 203.*
 # Plugin Verifier integration -> https://github.com/JetBrains/gradle-intellij-plugin#plugin-verifier-dsl

src/main/java/org/nixos/idea/lang/NixCommenter.java

@@ -0,0 +1,31 @@
+package org.nixos.idea.lang;
+
+import com.intellij.lang.Commenter;
+import org.jetbrains.annotations.Nullable;
+
+public class NixCommenter implements Commenter {
+    @Override
+    public @Nullable String getLineCommentPrefix() {
+        return "#";
+    }
+
+    @Override
+    public @Nullable String getBlockCommentPrefix() {
+        return "/*";
+    }
+
+    @Override
+    public @Nullable String getBlockCommentSuffix() {
+        return "*/";
+    }
+
+    @Override
+    public @Nullable String getCommentedBlockCommentPrefix() {
+        return null;
+    }
+
+    @Override
+    public @Nullable String getCommentedBlockCommentSuffix() {
+        return null;
+    }
+}

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

@@ -27,6 +27,10 @@
                 language="Nix"
                 implementationClass="org.nixos.idea.lang.NixBraceMatcher" />
 
+        <lang.commenter
+                language="Nix"
+                implementationClass="org.nixos.idea.lang.NixCommenter"/>
+
         <projectConfigurable
                 groupId="build"
                 displayName="NixIDEA Settings"

src/test/java/org/nixos/idea/lang/NixCommenterTest.java

@@ -0,0 +1,29 @@
+package org.nixos.idea.lang;
+
+import com.intellij.codeInsight.generation.actions.CommentByBlockCommentAction;
+import com.intellij.codeInsight.generation.actions.CommentByLineCommentAction;
+import com.intellij.testFramework.fixtures.BasePlatformTestCase;
+import org.nixos.idea.file.NixFileType;
+
+public class NixCommenterTest extends BasePlatformTestCase {
+
+    public void testLineComment() {
+        myFixture.configureByText(NixFileType.INSTANCE, "<caret>services.nginx.enable = true;");
+
+        CommentByLineCommentAction commentAction = new CommentByLineCommentAction();
+        commentAction.actionPerformedImpl(getProject(), myFixture.getEditor());
+        myFixture.checkResult("#services.nginx.enable = true;");
+        commentAction.actionPerformedImpl(getProject(), myFixture.getEditor());
+        myFixture.checkResult("services.nginx.enable = true;");
+    }
+
+    public void testBlockComment() {
+        myFixture.configureByText(NixFileType.INSTANCE, "<selection><caret>services.nginx.enable = true;</selection>\n");
+
+        CommentByBlockCommentAction commentAction = new CommentByBlockCommentAction();
+        commentAction.actionPerformedImpl(getProject(), myFixture.getEditor());
+        myFixture.checkResult("/*services.nginx.enable = true;*/\n");
+        commentAction.actionPerformedImpl(getProject(), myFixture.getEditor());
+        myFixture.checkResult("services.nginx.enable = true;\n");
+    }
+}