Rename comment roles to match intellij names

Author: waleedyaseen

src/main/gen/io/runescript/plugin/lang/lexer/_RsLexer.java

@@ -655,7 +655,7 @@ else if (zzAtEOF) {
             switch (zzLexicalState) {
             case BLOCK_COMMENT: {
               popState();
-    return MULTI_LINE_COMMENT;
+    return BLOCK_COMMENT;
             }  // fall though
             case 133: break;
             default:
@@ -886,12 +886,12 @@ else if (zzAtEOF) {
           case 86: break;
           case 37:
             { popState();
-    return MULTI_LINE_COMMENT;
+    return BLOCK_COMMENT;
             }
           // fall through
           case 87: break;
           case 38:
-            { return SINGLE_LINE_COMMENT;
+            { return LINE_COMMENT;
             }
           // fall through
           case 88: break;
@@ -901,7 +901,7 @@ else if (zzAtEOF) {
           // fall through
           case 89: break;
           case 40:
-            { return MULTI_LINE_COMMENT;
+            { return BLOCK_COMMENT;
             }
           // fall through
           case 90: break;

src/main/grammars/RuneScript.flex

@@ -65,22 +65,22 @@ INCOMPLETE_TAG = "<"(shad|col|str|u|img)"="
 <BLOCK_COMMENT> {
 "*/" {
     popState();
-    return MULTI_LINE_COMMENT;
+    return BLOCK_COMMENT;
 }
 <<EOF>> {
     popState();
-    return MULTI_LINE_COMMENT;
+    return BLOCK_COMMENT;
 }
 [\s\S] { }
 }
 
 <YYINITIAL,STRING_INTERPOLATION> {
 
 // Comments
-"/**/" { return MULTI_LINE_COMMENT; }
+"/**/" { return BLOCK_COMMENT; }
 "/*" { pushState(BLOCK_COMMENT); }
 
-{LINE_COMMENT} { return SINGLE_LINE_COMMENT; }
+{LINE_COMMENT} { return LINE_COMMENT; }
 // Keywords
 "if" { return IF; }
 "else" { return ELSE; }

src/main/kotlin/io/runescript/plugin/ide/RsCommenter.kt

@@ -28,11 +28,11 @@ class RsCommenter : CodeDocumentationAwareCommenter {
     }
 
     override fun getLineCommentTokenType(): IElementType {
-        return RsTokenTypes.SINGLE_LINE_COMMENT
+        return RsTokenTypes.LINE_COMMENT
     }
 
     override fun getBlockCommentTokenType(): IElementType {
-        return RsTokenTypes.MULTI_LINE_COMMENT
+        return RsTokenTypes.BLOCK_COMMENT
     }
 
     override fun getDocumentationCommentTokenType(): IElementType? {

src/main/kotlin/io/runescript/plugin/ide/folding/RsFoldingBuilder.kt

@@ -42,7 +42,7 @@ class RsFoldingBuilder : FoldingBuilderEx(), DumbAware {
                 }
 
                 is PsiComment -> {
-                    if (element.tokenType == RsTokenTypes.MULTI_LINE_COMMENT && !element.textRange.isEmpty) {
+                    if (element.tokenType == RsTokenTypes.BLOCK_COMMENT && !element.textRange.isEmpty) {
                         descriptors.add(FoldingDescriptor(element.node, element.textRange))
                     }
                 }
@@ -57,7 +57,7 @@ class RsFoldingBuilder : FoldingBuilderEx(), DumbAware {
                 return "{...}"
             }
 
-            RsTokenTypes.MULTI_LINE_COMMENT -> {
+            RsTokenTypes.BLOCK_COMMENT -> {
                 val whiteSpace = node.text.indexOfFirst { !Character.isWhitespace(it) && it != '/' && it != '*' }
                 val newLineIndex = node.text.indexOf('\n', whiteSpace).let { if (it == -1) node.text.length else it }
                 if (whiteSpace == -1 || newLineIndex < 1) {

src/main/kotlin/io/runescript/plugin/ide/formatter/lineIndent/RsLineIndentProvider.kt

@@ -48,8 +48,8 @@ class RsLineIndentProvider : JavaLikeLangLineIndentProvider() {
             RsElementTypes.DEFAULT to SwitchDefault,
             RsElementTypes.ELSE to ElseKeyword,
             RsElementTypes.IF to IfKeyword,
-            RsTokenTypes.MULTI_LINE_COMMENT to BlockComment,
-            RsTokenTypes.SINGLE_LINE_COMMENT to LineComment,
+            RsTokenTypes.BLOCK_COMMENT to BlockComment,
+            RsTokenTypes.LINE_COMMENT to LineComment,
             RsElementTypes.COMMA to Comma
         )
     }

src/main/kotlin/io/runescript/plugin/ide/highlight/RsSyntaxHighlighter.kt

@@ -8,8 +8,8 @@ import com.intellij.psi.tree.TokenSet
 import io.runescript.plugin.lang.lexer.RsLexerAdapter
 import io.runescript.plugin.lang.lexer.RsLexerInfo
 import io.runescript.plugin.lang.psi.RsElementTypes.*
-import io.runescript.plugin.lang.psi.RsTokenTypes.MULTI_LINE_COMMENT
-import io.runescript.plugin.lang.psi.RsTokenTypes.SINGLE_LINE_COMMENT
+import io.runescript.plugin.lang.psi.RsTokenTypes.BLOCK_COMMENT
+import io.runescript.plugin.lang.psi.RsTokenTypes.LINE_COMMENT
 import io.runescript.plugin.lang.psi.RsTokenTypesSets.BRACES
 import io.runescript.plugin.lang.psi.RsTokenTypesSets.BRACKETS
 import io.runescript.plugin.lang.psi.RsTokenTypesSets.KEYWORDS
@@ -37,8 +37,8 @@ class RsSyntaxHighlighter(private val lexerInfo: RsLexerInfo) : SyntaxHighlighte
             attributes[ARRAY_TYPE_LITERAL] = RsSyntaxHighlighterColors.ARRAY_TYPE_LITERAL
             fillMap(attributes, TokenSet.create(STRING_START, STRING_PART, STRING_END), RsSyntaxHighlighterColors.STRING)
             attributes[STRING_TAG] = RsSyntaxHighlighterColors.STRING_TAG
-            attributes[MULTI_LINE_COMMENT] = RsSyntaxHighlighterColors.BLOCK_COMMENT
-            attributes[SINGLE_LINE_COMMENT] = RsSyntaxHighlighterColors.LINE_COMMENT
+            attributes[BLOCK_COMMENT] = RsSyntaxHighlighterColors.BLOCK_COMMENT
+            attributes[LINE_COMMENT] = RsSyntaxHighlighterColors.LINE_COMMENT
             fillMap(attributes, OPERATORS, RsSyntaxHighlighterColors.OPERATION_SIGN)
             fillMap(attributes, BRACES, RsSyntaxHighlighterColors.BRACES)
             attributes[SEMICOLON] = RsSyntaxHighlighterColors.SEMICOLON

src/main/kotlin/io/runescript/plugin/lang/psi/RsTokenTypes.kt

@@ -2,7 +2,7 @@ package io.runescript.plugin.lang.psi
 
 object RsTokenTypes {
     @JvmField
-    val SINGLE_LINE_COMMENT = RsElementType("SINGLE_LINE_COMMENT")
+    val LINE_COMMENT = RsElementType("LINE_COMMENT")
     @JvmField
-    val MULTI_LINE_COMMENT = RsElementType("MULTI_LINE_COMMENT")
+    val BLOCK_COMMENT = RsElementType("BLOCK_COMMENT")
 }

src/main/kotlin/io/runescript/plugin/lang/psi/RsTokenTypesSets.kt

@@ -2,8 +2,8 @@ package io.runescript.plugin.lang.psi
 
 import com.intellij.psi.tree.TokenSet
 import io.runescript.plugin.lang.psi.RsElementTypes.*
-import io.runescript.plugin.lang.psi.RsTokenTypes.MULTI_LINE_COMMENT
-import io.runescript.plugin.lang.psi.RsTokenTypes.SINGLE_LINE_COMMENT
+import io.runescript.plugin.lang.psi.RsTokenTypes.BLOCK_COMMENT
+import io.runescript.plugin.lang.psi.RsTokenTypes.LINE_COMMENT
 
 object RsTokenTypesSets {
 
@@ -50,8 +50,8 @@ object RsTokenTypesSets {
         RPAREN,
     )
     val COMMENTS = TokenSet.create(
-        SINGLE_LINE_COMMENT,
-        MULTI_LINE_COMMENT,
+        LINE_COMMENT,
+        BLOCK_COMMENT,
     )
 
     val STRING_ELEMENTS = TokenSet.create(STRING_START, STRING_PART, STRING_TAG, STRING_END)