Merge pull request #22 from madwareru/fixes/21_add-char-support

Fixes/21 add char support
madwareru · Dec 10, 2021 · c7b5006 · c7b5006
2 parents 1c1c03e + 49efe2b
commit c7b5006
Show file tree

Hide file tree

Showing 11 changed files with 146 additions and 171 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -3,6 +3,9 @@
 # RON Extended Support Changelog
 
 ## [Unreleased]
+### Fixed
+- Fixed char literal parsing. Now we support simple char literals.
+
 ## [0.2.6]
 ### Fixed
 - Updated plugin to support new versions of IDE

diff --git a/gradle.properties b/gradle.properties
@@ -3,7 +3,7 @@
 
 pluginGroup = com.github.madwareru.intellijronremix
 pluginName = RON Extended Support
-pluginVersion = 0.2.6
+pluginVersion = 0.2.7
 
 pluginSinceBuild = 203
 pluginUntilBuild = 213.*

diff --git a/src/main/gen/com/github/madwareru/intellijronremix/language/__RONLexer.java b/src/main/gen/com/github/madwareru/intellijronremix/language/__RONLexer.java
diff --git a/src/main/gen/com/github/madwareru/intellijronremix/language/psi/RONMapKey.java b/src/main/gen/com/github/madwareru/intellijronremix/language/psi/RONMapKey.java
diff --git a/src/main/gen/com/github/madwareru/intellijronremix/language/psi/RONValue.java b/src/main/gen/com/github/madwareru/intellijronremix/language/psi/RONValue.java
diff --git a/src/main/gen/com/github/madwareru/intellijronremix/language/psi/impl/RONMapKeyImpl.java b/src/main/gen/com/github/madwareru/intellijronremix/language/psi/impl/RONMapKeyImpl.java
diff --git a/src/main/gen/com/github/madwareru/intellijronremix/language/psi/impl/RONValueImpl.java b/src/main/gen/com/github/madwareru/intellijronremix/language/psi/impl/RONValueImpl.java
diff --git a/src/main/kotlin/com/github/madwareru/intellijronremix/ide/RONSyntaxHighlighter.kt b/src/main/kotlin/com/github/madwareru/intellijronremix/ide/RONSyntaxHighlighter.kt
@@ -35,7 +35,7 @@ class RONSyntaxHighlighter : SyntaxHighlighterBase() {
             RONTypes.BRACKETL, RONTypes.BRACKETR -> RONColor.BRACKETS
             RONTypes.BRACEL, RONTypes.BRACER -> RONColor.BRACES
             RONTypes.INTEGER, RONTypes.FLOAT -> RONColor.NUMBER
-            RONTypes.STRING, RONTypes.RAW_STRING -> RONColor.STRING
+            RONTypes.STRING, RONTypes.RAW_STRING, RONTypes.CHAR -> RONColor.STRING
             RONTypes.SOME, RONTypes.NONE -> RONColor.OPTION
             RONTypes.COMMENT, RONTypes.BLOCK_COMMENT -> RONColor.COMMENT
             else -> null

diff --git a/src/main/kotlin/com/github/madwareru/intellijronremix/language/RON.bnf b/src/main/kotlin/com/github/madwareru/intellijronremix/language/RON.bnf
@@ -26,8 +26,8 @@
         INTEGER = "regexp:[+-]?((0x[0-9A-Fa-f][0-9A-Fa-f_]*)|((0[bo]?)?[0-9][0-9_]*))"
         FLOAT = "regexp:([+-]?[0-9]+\.[0-9]*([Ee][0-9]+)?)|(\.[0-9]+([Ee][0-9]+)?)"
 
-        CHAR = "regexp:'([ -&(-\[\]-~])|(\\')|(\\\\)'"
-        STRING = "regexp:\"([^\r\n\"]|(\\[\S]))*\""
+        CHAR = "CHAR"
+        STRING = "STRING"
         RAW_STRING = "RAW STRING"
 
         EXT_PREFIX = "#!["

diff --git a/src/main/kotlin/com/github/madwareru/intellijronremix/language/RONParserDefinition.kt b/src/main/kotlin/com/github/madwareru/intellijronremix/language/RONParserDefinition.kt
@@ -34,7 +34,7 @@ class RONParserDefinition : ParserDefinition {
 
     companion object {
         val COMMENTS = TokenSet.create(RONTypes.COMMENT, RONTypes.BLOCK_COMMENT)
-        val STRING_LITERALS = TokenSet.create(RONTypes.STRING)
+        val STRING_LITERALS = TokenSet.create(RONTypes.STRING, RONTypes.RAW_STRING)
         val FILE = IFileElementType(RONLanguage.INSTANCE)
     }
 }
diff --git a/src/main/kotlin/com/github/madwareru/intellijronremix/language/__RONLexer.flex b/src/main/kotlin/com/github/madwareru/intellijronremix/language/__RONLexer.flex
@@ -63,7 +63,7 @@ BOOLEAN=true|false
 IDENT=[A-Za-z_][A-Za-z0-9_]*
 INTEGER=[+-]?((0x[0-9A-Fa-f][0-9A-Fa-f_]*)|(0b[0-1][0-1_]*)|(0o[0-7][0-7_]*)|([0-9][0-9_]*))
 FLOAT=([+-]?[0-9]+\.[0-9]*([Ee][0-9]+)?)|(\.[0-9]+([Ee][0-9]+)?)
-CHAR='([ -&(-\[\]-~])|(\')|(\\\\)'
+CHAR='([^\r\n\"] | (\\[\S]))'
 STRING=\"([^\r\n\"]|(\\[\S]))*\"
 
 %%