feat(editor): implement quote handling (#65)

* feat(editor): implement quote handling Signed-off-by: Luke Gareth Ribchester <luke@luke.gr> * docs(changelog): update entry Signed-off-by: Luke Gareth Ribchester <luke@luke.gr> * docs(changelog): update entry Signed-off-by: Luke Gareth Ribchester <luke@luke.gr> --------- Signed-off-by: Luke Gareth Ribchester <luke@luke.gr>
lukeribchester · May 4, 2024 · d2968fd · d2968fd
1 parent e1dcc7c
commit d2968fd
Show file tree

Hide file tree

Showing 8 changed files with 291 additions and 270 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -4,6 +4,10 @@
 
 ## [Unreleased]
 
+### Added
+
+- Enhanced string handling
+
 ## [0.3.0] - 2024-05-03
 
 ### Added

diff --git a/gradle.properties b/gradle.properties
@@ -4,7 +4,7 @@ pluginGroup = io.kadena.pact
 pluginName = Pact
 pluginRepositoryUrl = https://github.com/lukeribchester/pact-intellij
 # SemVer format -> https://semver.org
-pluginVersion = 0.3.0
+pluginVersion = 0.3.1
 
 # Supported build number ranges and IntelliJ Platform versions -> https://plugins.jetbrains.com/docs/intellij/build-number-ranges.html
 pluginSinceBuild = 232

diff --git a/src/main/gen/io/kadena/pact/language/PactLexer.java b/src/main/gen/io/kadena/pact/language/PactLexer.java
diff --git a/src/main/kotlin/io/kadena/pact/ide/editor/PactQuoteHandler.kt b/src/main/kotlin/io/kadena/pact/ide/editor/PactQuoteHandler.kt
@@ -0,0 +1,8 @@
+package io.kadena.pact.ide.editor
+
+import com.intellij.codeInsight.editorActions.SimpleTokenSetQuoteHandler
+import io.kadena.pact.language.psi.PactTokenSets
+
+
+class PactQuoteHandler : SimpleTokenSetQuoteHandler(PactTokenSets.STRINGS) {
+}
diff --git a/src/main/kotlin/io/kadena/pact/language/Pact.bnf b/src/main/kotlin/io/kadena/pact/language/Pact.bnf
@@ -63,7 +63,7 @@
     KEYWORD_MODEL_ANNOTATION="@model"
 
     /* Literals */
-    STR="regexp:(\"([^\"\\]|\\\"|\\)*\")"
+    STR="regexp:(\"([^\"\\\n]|\\.|\\\n)*\"?)"
     INTEGER="regexp:([+-]?[0-9]+)"
     FLOATING_POINT="regexp:([+-]?([0-9]+\.[0-9]*|\.[0-9]+)([eE][+-]?[0-9]+)?)"
     TRUE="true"

diff --git a/src/main/kotlin/io/kadena/pact/language/Pact.flex b/src/main/kotlin/io/kadena/pact/language/Pact.flex
@@ -65,7 +65,7 @@ KEYWORD_MANAGED_ANNOTATION="@managed"
 KEYWORD_MODEL_ANNOTATION="@model"
 
 /* Literals */
-STR=(\"([^\"\\]|\\\"|\\)*\")
+STR=(\"([^\"\\\n]|\\.|\\\n)*\"?)
 INTEGER=([+-]?[0-9]+)
 FLOATING_POINT=([+-]?([0-9]+\.[0-9]*|\.[0-9]+)([eE][+-]?[0-9]+)?)
 TRUE="true"

diff --git a/src/main/kotlin/io/kadena/pact/language/psi/PactTokenSets.kt b/src/main/kotlin/io/kadena/pact/language/psi/PactTokenSets.kt
@@ -5,6 +5,10 @@ import com.intellij.psi.tree.TokenSet
 
 interface PactTokenSets {
     companion object {
+        /* Comments */
         val COMMENTS: TokenSet = TokenSet.create(PactTypes.COMMENT)
+
+        /* Literals */
+        val STRINGS: TokenSet = TokenSet.create(PactTypes.STR)
     }
 }
diff --git a/src/main/resources/META-INF/plugin.xml b/src/main/resources/META-INF/plugin.xml
@@ -43,5 +43,10 @@
         <!-- Language Server (LSP) -->
         <platform.lsp.serverSupportProvider
                 implementation="io.kadena.pact.lsp.PactLspServerSupportProvider"/>
+
+        <!-- Quote Handler -->
+        <lang.quoteHandler
+                language="Pact"
+                implementationClass="io.kadena.pact.ide.editor.PactQuoteHandler"/>
     </extensions>
 </idea-plugin>