fixing issue #298 (Fixing issue with extra closing brace when typing …

…${ outside of strings)
HaxeFoundation · Aug 24, 2024 · 2350d4c · 2350d4c
1 parent d434c7b
commit 2350d4c
Showing 1 changed file with 9 additions and 3 deletions.
diff --git a/src/main/java/com/intellij/plugins/haxe/ide/editor/HaxeTypedHandler.java b/src/main/java/com/intellij/plugins/haxe/ide/editor/HaxeTypedHandler.java
@@ -28,8 +28,8 @@
 import com.intellij.plugins.haxe.lang.lexer.HaxeTokenTypes;
 import com.intellij.plugins.haxe.lang.psi.HaxeComponentName;
 import com.intellij.plugins.haxe.lang.psi.HaxePsiCompositeElement;
+import com.intellij.plugins.haxe.lang.psi.HaxeStringLiteralExpression;
 import com.intellij.plugins.haxe.lang.psi.HaxeType;
-import com.intellij.plugins.haxe.util.HaxeDebugPsiUtil;
 import com.intellij.plugins.haxe.util.UsefulPsiTreeUtil;
 import com.intellij.psi.PsiElement;
 import com.intellij.psi.PsiFile;
@@ -73,8 +73,14 @@ private static boolean checkAfterTypeOrComponentName(PsiFile file, int offset) {
 
   private static boolean checkAfterDollarInString(PsiFile file, int offset) {
     PsiElement at = file.findElementAt(offset - 1);
-    final String text = at != null ? at.getText() : "";
-    return text.endsWith("$") && PsiTreeUtil.getParentOfType(at, HaxePsiCompositeElement.class) != null;
+    if (at != null) {
+      HaxeStringLiteralExpression type = PsiTreeUtil.getParentOfType(at, HaxeStringLiteralExpression.class);
+      if (type != null) {
+        final String text = at.getText();
+        return text.endsWith("$") && PsiTreeUtil.getParentOfType(at, HaxePsiCompositeElement.class) != null;
+      }
+    }
+    return false;
   }
 
   @NotNull