charting

Author: smklimenko

CHANGELOG.md

@@ -1,5 +1,11 @@
 # KdbInsideBrains Changelog
 
+## 6.3.0
+
+### Added
+
+- Semantic highlighting added: colouring local variable and lambda parameters
+
 ## 6.2.0
 
 ### Added

src/main/java/org/kdb/inside/brains/lang/QRainbowVisitor.java

@@ -0,0 +1,45 @@
+package org.kdb.inside.brains.lang;
+
+import com.intellij.codeInsight.daemon.RainbowVisitor;
+import com.intellij.codeInsight.daemon.impl.HighlightInfo;
+import com.intellij.codeInsight.daemon.impl.HighlightVisitor;
+import com.intellij.psi.PsiElement;
+import com.intellij.psi.PsiFile;
+import org.jetbrains.annotations.NotNull;
+import org.kdb.inside.brains.QFileType;
+import org.kdb.inside.brains.psi.*;
+
+public class QRainbowVisitor extends RainbowVisitor {
+    @Override
+    public boolean suitableForFile(@NotNull PsiFile psiFile) {
+        return QFileType.is(psiFile);
+    }
+
+    @Override
+    public void visit(@NotNull PsiElement psiElement) {
+        if (psiElement instanceof @NotNull QVariable var && !var.isGlobal()) {
+            addInfo(createVariableInfo(var));
+        }
+    }
+
+    private HighlightInfo createVariableInfo(@NotNull QVariable var) {
+        final String name = var.getName();
+        final ElementContext context = ElementContext.of(var);
+        final ElementScope scope = context.getScope();
+
+        if (scope == ElementScope.PARAMETERS) {
+            return getInfo(context.parameters(), var, name, QSyntaxHighlighter.VARIABLE);
+        } else if (scope == ElementScope.LAMBDA) {
+            final QLambdaExpr lambda = context.lambda();
+            if (QPsiUtil.isInnerDeclaration(lambda, name)) {
+                return getInfo(context.getElement(), var, var.getName(), QSyntaxHighlighter.VARIABLE);
+            }
+        }
+        return null;
+    }
+
+    @Override
+    public @NotNull HighlightVisitor clone() {
+        return new QRainbowVisitor();
+    }
+}

src/main/java/org/kdb/inside/brains/psi/QPsiUtil.java

@@ -14,6 +14,7 @@
 import org.kdb.inside.brains.QFileType;
 
 import java.util.ArrayList;
+import java.util.Collection;
 import java.util.List;
 import java.util.function.Predicate;
 
@@ -100,6 +101,22 @@ public static boolean isGlobalDeclaration(@NotNull QVarDeclaration declaration)
         };
     }
 
+    public static boolean isInnerDeclaration(QLambda lambda, String name) {
+        // implicit variable or in parameters list - ignore namespace
+        if (lambda.getParameters() == null && QPsiUtil.isImplicitName(name)) {
+            return true;
+        }
+
+        final Collection<QVarDeclaration> declarations = PsiTreeUtil.findChildrenOfType(lambda, QVarDeclaration.class);
+        for (QVarDeclaration declaration : declarations) {
+            // Same name and same lambda - internal variable
+            if (name.equals(declaration.getName()) && !QPsiUtil.isGlobalDeclaration(declaration)) {
+                return true;
+            }
+        }
+        return false;
+    }
+
     /**
      * Checks is the specified element colon or not.
      *

src/main/java/org/kdb/inside/brains/psi/mixin/QVariableBase.java

@@ -10,7 +10,6 @@
 import org.kdb.inside.brains.psi.*;
 
 import javax.swing.*;
-import java.util.Collection;
 
 public class QVariableBase extends QPsiElementImpl implements QVariable, ItemPresentation {
     private String name = null;
@@ -90,21 +89,9 @@ private String calculateQualifiedName() {
 
         // no lambda - return full name
         final QLambdaExpr lambda = getContext(QLambdaExpr.class);
-        if (lambda != null) {
-            // implicit variable or in parameters list - ignore namespace
-            if (lambda.getParameters() == null && QPsiUtil.isImplicitName(name)) {
-                return name;
-            }
-
-            final Collection<QVarDeclaration> declarations = PsiTreeUtil.findChildrenOfType(lambda, QVarDeclaration.class);
-            for (QVarDeclaration declaration : declarations) {
-                // Same name and same lambda - internal variable
-                if (name.equals(declaration.getName()) && !QPsiUtil.isGlobalDeclaration(declaration)) {
-                    return name;
-                }
-            }
+        if (lambda != null && QPsiUtil.isInnerDeclaration(lambda, name)) {
+            return name;
         }
-
         return QPsiUtil.createQualifiedName(namespaceName, name);
     }
 

src/main/java/org/kdb/inside/brains/settings/KdbColorSettingsPage.java

@@ -66,11 +66,12 @@ public Language getLanguage() {
                 "`a`b`c\n" +
                 "variable\n" +
                 "(+;*;<;>;~=)\n" +
-                "count\n" +
+                "count;\n" +
                 "`int$()\n" +
                 "a ,/:\\\\: b\n" +
                 "(if[];?[];$[])\n" +
-                "\\d .some.dir";
+                "\\d .some.dir\n" +
+                "{[param1;param2;param2] localV:10; :param1+param2+param3+localV+globalE; }\n";
         // @formatter:on
     }
 

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

@@ -499,6 +499,8 @@
         <codeInsight.lineMarkerProvider language="q"
                                         implementationClass="org.kdb.inside.brains.lang.marker.SystemFunctionsMarkerProvider"/>
 
+        <highlightVisitor implementation="org.kdb.inside.brains.lang.QRainbowVisitor"/>
+
         <!-- Indexes -->
         <fileBasedIndex implementation="org.kdb.inside.brains.psi.index.QIdentifiersIndex"/>
         <projectService serviceImplementation="org.kdb.inside.brains.psi.index.QIndexService"/>

version.properties

@@ -1 +1 @@
-pluginVersion=6.2.0
+pluginVersion=6.3.0