Merge pull request #129 from kdbinsidebrains/fixes

smklimenko · web-flow · commit 6e15cdc039e2 · 2025-06-30T13:10:18.000+01:00
fixes
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,13 @@
 # KdbInsideBrains Changelog
 
+## 6.3.2
+
+### Fixed
+
+- Implicit variables (x,y,z) are not highlighted in Rainbow
+- Implicit variables (x,y,z) shown as undefined if lambda defined in a context (\d)
+- Global variable assignment marked by rainbow as local
+
 ## 6.3.1
 
 ### Added
diff --git a/src/main/java/org/kdb/inside/brains/lang/QRainbowVisitor.java b/src/main/java/org/kdb/inside/brains/lang/QRainbowVisitor.java
@@ -7,11 +7,9 @@
 import com.intellij.psi.PsiFile;
 import com.intellij.psi.PsiReference;
 import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
 import org.kdb.inside.brains.QFileType;
-import org.kdb.inside.brains.psi.ElementScope;
-import org.kdb.inside.brains.psi.QLambda;
-import org.kdb.inside.brains.psi.QVarDeclaration;
-import org.kdb.inside.brains.psi.QVariable;
+import org.kdb.inside.brains.psi.*;
 
 public class QRainbowVisitor extends RainbowVisitor {
     @Override
@@ -21,12 +19,15 @@ public boolean suitableForFile(@NotNull PsiFile psiFile) {
 
     @Override
     public void visit(@NotNull PsiElement psiElement) {
-        if (psiElement instanceof @NotNull QVariable var && !var.isGlobal()) {
-            addInfo(createVariableInfo(var));
+        if (psiElement instanceof @NotNull QVariable var) {
+            final HighlightInfo info = createVariableInfo(var);
+            if (info != null) {
+                addInfo(info);
+            }
         }
     }
 
-    private HighlightInfo createVariableInfo(@NotNull QVariable var) {
+    private @Nullable HighlightInfo createVariableInfo(@NotNull QVariable var) {
         final QLambda lambda = var.getContext(QLambda.class);
         if (lambda == null) {
             return null;
@@ -36,6 +37,10 @@ private HighlightInfo createVariableInfo(@NotNull QVariable var) {
             return getInfo(var, d, lambda);
         }
 
+        if (lambda.isImplicitDeclaration(var)) {
+            return createInfo(lambda, var);
+        }
+
         final PsiReference[] references = var.getReferences();
         for (PsiReference reference : references) {
             final PsiElement resolve = reference.resolve();
@@ -49,15 +54,15 @@ private HighlightInfo createVariableInfo(@NotNull QVariable var) {
         return null;
     }
 
-    private HighlightInfo getInfo(QVariable v, QVarDeclaration d, QLambda lambda) {
-        if (d.isGlobal()) {
+    private @Nullable HighlightInfo getInfo(@NotNull QVariable var, @NotNull QVarDeclaration dec, @NotNull QLambda lambda) {
+        if (QPsiUtil.isGlobalDeclaration(dec)) {
             return null;
         }
 
-        final ElementScope scope = d.getVariableContext().getScope();
+        final ElementScope scope = dec.getVariableContext().getScope();
         // only root variables, no tables, dicts and so on
         if (scope == ElementScope.PARAMETERS || scope == ElementScope.LAMBDA) {
-            return getInfo(lambda, v, v.getName(), QSyntaxHighlighter.VARIABLE);
+            return createInfo(lambda, var);
         }
         return null;
     }
@@ -66,4 +71,8 @@ private HighlightInfo getInfo(QVariable v, QVarDeclaration d, QLambda lambda) {
     public @NotNull HighlightVisitor clone() {
         return new QRainbowVisitor();
     }
+
+    private @NotNull HighlightInfo createInfo(@NotNull QLambda lambda, @NotNull QVariable var) {
+        return getInfo(lambda, var, var.getName(), QSyntaxHighlighter.VARIABLE);
+    }
 }
diff --git a/src/main/java/org/kdb/inside/brains/lang/inspection/UndefinedVariableInspection.java b/src/main/java/org/kdb/inside/brains/lang/inspection/UndefinedVariableInspection.java
@@ -32,11 +32,12 @@ protected void validate(@NotNull QVarReference variable, @NotNull ProblemsHolder
             return;
         }
 
-        if (QPsiUtil.isImplicitVariable(variable)) {
+        if (UndefinedExclusion.isExcluded(qualifiedName)) {
             return;
         }
 
-        if (UndefinedExclusion.isExcluded(qualifiedName)) {
+        final QLambda lambda = variable.getContext(QLambda.class);
+        if (lambda != null && lambda.isImplicitDeclaration(variable)) {
             return;
         }
 
diff --git a/src/main/java/org/kdb/inside/brains/psi/QLambda.java b/src/main/java/org/kdb/inside/brains/psi/QLambda.java
@@ -1,12 +1,22 @@
 package org.kdb.inside.brains.psi;
 
+import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
 public interface QLambda extends QPsiElement {
+    String getVariables();
+
+    String getParametersInfo();
+
     @Nullable
     QParameters getParameters();
 
-    String getVariables();
 
-    String getParametersInfo();
+//    boolean isImplicitVariable(String name);
+
+    boolean isImplicitDeclaration(@NotNull QVariable variable);
+
+
+    @Nullable
+    QVarDeclaration getLocalDeclaration(@NotNull QVariable variable);
 }
diff --git a/src/main/java/org/kdb/inside/brains/psi/QPsiUtil.java b/src/main/java/org/kdb/inside/brains/psi/QPsiUtil.java
@@ -70,14 +70,6 @@ public static boolean isImplicitName(@NotNull String name) {
         return 'x' == c || 'y' == c || 'z' == c;
     }
 
-    public static boolean isImplicitVariable(@NotNull QVariable variable) {
-        if (isImplicitName(variable.getQualifiedName())) {
-            final QLambdaExpr enclosingLambda = variable.getContext(QLambdaExpr.class);
-            return enclosingLambda != null && enclosingLambda.getParameters() == null;
-        }
-        return false;
-    }
-
     public static boolean isGlobalDeclaration(@NotNull QVarDeclaration declaration) {
         final ElementContext ctx = ElementContext.of(declaration);
         return switch (ctx.getScope()) {
@@ -175,39 +167,6 @@ public static PsiElement getNextNotWhitespace(PsiElement e) {
         return sibling;
     }
 
-
-    public static @Nullable QVarDeclaration getLocalDeclaration(@NotNull QLambda lambda, @NotNull QVariable variable) {
-        final String name = variable.getName();
-        // implicit variable or in parameters list - ignore namespace
-        if (lambda.getParameters() == null && QPsiUtil.isImplicitName(name)) {
-            return null;
-        }
-
-        final QVarDeclaration[] res = new QVarDeclaration[1];
-        lambda.acceptChildren(new PsiRecursiveElementWalkingVisitor() {
-            @Override
-            public void visitElement(@NotNull PsiElement element) {
-                // we don't search inside others lambda, query, table or dict
-                if (QPsiUtil.isLocalContextElement(element)) {
-                    return;
-                }
-
-                // no reason to search after the definition.// In a lambda it can't be below.
-                if (element.equals(variable)) {
-                    stopWalking();
-                } else if (element instanceof QVarDeclaration d) {
-                    if (name.equals(d.getName()) && !QPsiUtil.isGlobalDeclaration(d)) {
-                        res[0] = d;
-                        stopWalking();
-                    }
-                } else {
-                    super.visitElement(element);
-                }
-            }
-        });
-        return res[0];
-    }
-
     public static PsiElement findRootExpression(PsiElement element, PsiElement context) {
         if (element == null) {
             return null;
diff --git a/src/main/java/org/kdb/inside/brains/psi/QVariable.java b/src/main/java/org/kdb/inside/brains/psi/QVariable.java
@@ -17,15 +17,6 @@ public interface QVariable extends QPsiElement {
     @NotNull
     String getQualifiedName();
 
-    /**
-     * Returns true of the qualified name starts with dot: <code>.asd.qwe</code>.
-     *
-     * @return true if it's global definition or false otherwise.
-     */
-    default boolean isGlobal() {
-        return QPsiUtil.hasNamespace(getQualifiedName());
-    }
-
     /**
      * Returns last tone of the name or the full name.
      */
diff --git a/src/main/java/org/kdb/inside/brains/psi/mixin/QLambdaMixin.java b/src/main/java/org/kdb/inside/brains/psi/mixin/QLambdaMixin.java
@@ -1,10 +1,12 @@
 package org.kdb.inside.brains.psi.mixin;
 
 import com.intellij.lang.ASTNode;
+import com.intellij.psi.PsiElement;
+import com.intellij.psi.PsiRecursiveElementWalkingVisitor;
 import icons.KdbIcons;
+import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
-import org.kdb.inside.brains.psi.QLambda;
-import org.kdb.inside.brains.psi.QParameters;
+import org.kdb.inside.brains.psi.*;
 import org.kdb.inside.brains.psi.impl.QExpressionImpl;
 
 import javax.swing.*;
@@ -33,4 +35,42 @@ public String getParametersInfo() {
         }
         return parameters.getParametersInfo();
     }
+
+    @Override
+    public boolean isImplicitDeclaration(@NotNull QVariable variable) {
+        return getParameters() == null && QPsiUtil.isImplicitName(variable.getName());
+    }
+
+    @Override
+    public @Nullable QVarDeclaration getLocalDeclaration(@NotNull QVariable variable) {
+        // implicit variable or in parameters list - ignore namespace
+        if (isImplicitDeclaration(variable)) {
+            return null;
+        }
+
+        final String name = variable.getName();
+        final QVarDeclaration[] res = new QVarDeclaration[1];
+        acceptChildren(new PsiRecursiveElementWalkingVisitor() {
+            @Override
+            public void visitElement(@NotNull PsiElement element) {
+                // we don't search inside others lambda, query, table or dict
+                if (QPsiUtil.isLocalContextElement(element)) {
+                    return;
+                }
+
+                // no reason to search after the definition.// In a lambda it can't be below.
+                if (element.equals(variable)) {
+                    stopWalking();
+                } else if (element instanceof QVarDeclaration d) {
+                    if (name.equals(d.getName()) && !QPsiUtil.isGlobalDeclaration(d)) {
+                        res[0] = d;
+                        stopWalking();
+                    }
+                } else {
+                    super.visitElement(element);
+                }
+            }
+        });
+        return res[0];
+    }
 }
diff --git a/src/main/java/org/kdb/inside/brains/psi/mixin/QVariableBase.java b/src/main/java/org/kdb/inside/brains/psi/mixin/QVariableBase.java
@@ -89,7 +89,7 @@ private String calculateQualifiedName() {
 
         // no lambda - return full name
         final QLambdaExpr lambda = getContext(QLambdaExpr.class);
-        if (lambda != null && QPsiUtil.getLocalDeclaration(lambda, this) != null) {
+        if (lambda != null && (lambda.isImplicitDeclaration(this) || lambda.getLocalDeclaration(this) != null)) {
             return name;
         }
         return QPsiUtil.createQualifiedName(namespaceName, name);
diff --git a/src/main/java/org/kdb/inside/brains/psi/refs/QVariableReferenceProvider.java b/src/main/java/org/kdb/inside/brains/psi/refs/QVariableReferenceProvider.java
@@ -61,11 +61,11 @@ private ResolveResult[] resolveVariable(QVariable variable, ElementContext conte
         }
 
         private ResolveResult[] resolveLambda(QLambdaExpr lambda, QVariable var) {
-            if (QPsiUtil.isImplicitVariable(var) && lambda.getParameters() == null) {
+            if (lambda.isImplicitDeclaration(var)) {
                 return ResolveResult.EMPTY_ARRAY;
             }
 
-            final QVarDeclaration declaration = QPsiUtil.getLocalDeclaration(lambda, var);
+            final QVarDeclaration declaration = lambda.getLocalDeclaration(var);
             if (declaration != null) {
                 return single(DeclarationRef.of(declaration));
             }
diff --git a/version.properties b/version.properties
@@ -1 +1 @@
-pluginVersion=6.3.1
+pluginVersion=6.3.2

Original file line number	Diff line number	Diff line change
`@@ -32,11 +32,12 @@ protected void validate(@NotNull QVarReference variable, @NotNull ProblemsHolder`
`32`	`32`	`return;`
`33`	`33`	`}`
`34`	`34`
`35`		`- if (QPsiUtil.isImplicitVariable(variable)) {`
	`35`	`+ if (UndefinedExclusion.isExcluded(qualifiedName)) {`
`36`	`36`	`return;`
`37`	`37`	`}`
`38`	`38`
`39`		`- if (UndefinedExclusion.isExcluded(qualifiedName)) {`
	`39`	`+ final QLambda lambda = variable.getContext(QLambda.class);`
	`40`	`+ if (lambda != null && lambda.isImplicitDeclaration(variable)) {`
`40`	`41`	`return;`
`41`	`42`	`}`
`42`	`43`
Original file line number	Diff line number	Diff line change
`@@ -89,7 +89,7 @@ private String calculateQualifiedName() {`
`89`	`89`
`90`	`90`	`// no lambda - return full name`
`91`	`91`	`final QLambdaExpr lambda = getContext(QLambdaExpr.class);`
`92`		`- if (lambda != null && QPsiUtil.getLocalDeclaration(lambda, this) != null) {`
	`92`	`+ if (lambda != null && (lambda.isImplicitDeclaration(this) \|\| lambda.getLocalDeclaration(this) != null)) {`
`93`	`93`	`return name;`
`94`	`94`	`}`
`95`	`95`	`return QPsiUtil.createQualifiedName(namespaceName, name);`
Original file line number	Diff line number	Diff line change
`@@ -61,11 +61,11 @@ private ResolveResult[] resolveVariable(QVariable variable, ElementContext conte`
`61`	`61`	`}`
`62`	`62`
`63`	`63`	`private ResolveResult[] resolveLambda(QLambdaExpr lambda, QVariable var) {`
`64`		`- if (QPsiUtil.isImplicitVariable(var) && lambda.getParameters() == null) {`
	`64`	`+ if (lambda.isImplicitDeclaration(var)) {`
`65`	`65`	`return ResolveResult.EMPTY_ARRAY;`
`66`	`66`	`}`
`67`	`67`
`68`		`- final QVarDeclaration declaration = QPsiUtil.getLocalDeclaration(lambda, var);`
	`68`	`+ final QVarDeclaration declaration = lambda.getLocalDeclaration(var);`
`69`	`69`	`if (declaration != null) {`
`70`	`70`	`return single(DeclarationRef.of(declaration));`
`71`	`71`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-pluginVersion=6.3.1`
	`1`	`+pluginVersion=6.3.2`