Simplify and expand schema based linting (#700)

Author: anderson4j

packages/language-support/src/autocompletion/schemaBasedCompletions.ts

@@ -6,7 +6,7 @@ import {
 import { DbSchema } from '../dbSchema.js';
 import { ParsedStatement } from '../cypherLanguageService.js';
 import { isLabelLeaf, LabelOrCondition, SymbolsInfo } from '../types.js';
-import { findParent } from '../helpers.js';
+import { findParent, getDirection } from '../helpers.js';
 import {
   NodePatternContext,
   PatternElementContext,
@@ -44,7 +44,7 @@ export function getShortPathCompletions(
 
   const { toRels: nodesToRelsSet, fromRels: nodesFromRelsSet } =
     getNodesFromRelsSet(dbSchema);
-  const assumedDirection = lastNode.leftArrow() ? 'outgoing' : 'incoming';
+  const assumedDirection = lastNode.leftArrow() ? 'left' : 'right';
 
   let cnfTree: LabelOrCondition;
   try {
@@ -65,7 +65,7 @@ export function getShortPathCompletions(
     cnfTree,
   );
 
-  if (assumedDirection === 'outgoing') {
+  if (assumedDirection === 'left') {
     for (const outLabel of outLabels) {
       snippetCompletions.push({
         label: '-(:' + outLabel + ')',
@@ -260,12 +260,7 @@ export function completeNodeLabel(
         return allLabelCompletions(dbSchema);
       }
 
-      const direction =
-        lastValidElement.leftArrow() && !lastValidElement.rightArrow()
-          ? 'outgoing'
-          : !lastValidElement.leftArrow() && lastValidElement.rightArrow()
-            ? 'incoming'
-            : 'bidirectional';
+      const direction = getDirection(lastValidElement);
 
       // limitation: not checking node label repetition
       const { toRels: nodesToRelsSet, fromRels: nodesFromRelsSet } =
@@ -288,9 +283,9 @@ export function completeNodeLabel(
         cnfTree,
       );
       const allNodes =
-        direction === 'outgoing'
+        direction === 'left'
           ? outLabels
-          : direction === 'incoming'
+          : direction === 'right'
             ? inLabels
             : inLabels.union(outLabels);
       return labelsToCompletions(Array.from(allNodes));
@@ -334,14 +329,9 @@ export function completeRelationshipType(
       parsingResult.stopNode,
       (x) => x instanceof RelationshipPatternContext,
     );
-    let direction = 'bidirectional';
+    let direction = 'undirected';
     if (thisCtx instanceof RelationshipPatternContext) {
-      direction =
-        thisCtx.leftArrow() && !thisCtx.rightArrow()
-          ? 'outgoing'
-          : !thisCtx.leftArrow() && thisCtx.rightArrow()
-            ? 'incoming'
-            : 'bidirectional';
+      direction = getDirection(thisCtx);
     }
 
     // limitation: bailing out on quantifiers
@@ -381,9 +371,9 @@ export function completeRelationshipType(
         cnfTree,
       );
       const allRels =
-        direction === 'outgoing'
+        direction === 'left'
           ? outLabels
-          : direction === 'incoming'
+          : direction === 'right'
             ? inLabels
             : inLabels.union(outLabels);
       return reltypesToCompletions(Array.from(allRels));

packages/language-support/src/cypherLanguageService.ts

@@ -24,6 +24,7 @@ import {
   StatementsOrCommandsContext,
   SymbolicNameStringContext,
   VariableContext,
+  PatternElementContext,
 } from './generated-parser/CypherCmdParser.js';
 import {
   findParent,
@@ -66,6 +67,7 @@ export interface ParsedStatement {
   collectedParameters: ParsedParameter[];
   collectedFunctions: ParsedFunction[];
   collectedProcedures: ParsedProcedure[];
+  collectedReadPatternElements: PatternElementContext[];
   cypherVersion?: CypherVersion;
 }
 
@@ -204,6 +206,7 @@ export function createParsingResult(
       const variableFinder = new VariableCollector();
       const methodsFinder = new MethodsCollector(tokens);
       const cypherVersionCollector = new CypherVersionCollector();
+      const readPatternElementsCollector = new ReadPatternElementsCollector();
       const errorListener = new SyntaxErrorsListener(
         tokens,
         settings.consoleCommandsEnabled,
@@ -214,6 +217,7 @@ export function createParsingResult(
         variableFinder,
         methodsFinder,
         cypherVersionCollector,
+        readPatternElementsCollector,
       ];
       parser.addErrorListener(errorListener);
       const ctx = parser.statementsOrCommands();
@@ -242,6 +246,8 @@ export function createParsingResult(
         collectedParameters: parameterFinder.parameters,
         collectedFunctions: methodsFinder.functions,
         collectedProcedures: methodsFinder.procedures,
+        collectedReadPatternElements:
+          readPatternElementsCollector.readPatternElements,
         cypherVersion: cypherVersionCollector.cypherVersion,
       };
     });
@@ -422,6 +428,25 @@ class VariableCollector implements ParseTreeListener {
   }
 }
 
+class ReadPatternElementsCollector implements ParseTreeListener {
+  readPatternElements: PatternElementContext[] = [];
+  enterEveryRule() {
+    /* no-op */
+  }
+  visitTerminal() {
+    /* no-op */
+  }
+  visitErrorNode() {
+    /* no-op */
+  }
+
+  exitEveryRule(ctx: unknown) {
+    if (ctx instanceof PatternElementContext && !couldCreateNewLabel(ctx)) {
+      this.readPatternElements.push(ctx);
+    }
+  }
+}
+
 export function getMethodName(
   ctx: ProcedureNameContext | FunctionNameContext,
 ): string {

packages/language-support/src/helpers.ts

@@ -209,6 +209,23 @@ export function resolveCypherVersion(
   return cypherVersion;
 }
 
+export function getDirection(
+  rel: RelationshipPatternContext,
+): 'right' | 'left' | 'undirected' {
+  // An unfinished relationship (no closing `]`) has an ambiguous direction, so
+  // it is treated as undirected.
+  const complete = Boolean(rel.RBRACKET());
+  const hasLeft = Boolean(rel.leftArrow());
+  const hasRight = Boolean(rel.rightArrow());
+  if (complete && hasRight && !hasLeft) {
+    return 'right';
+  }
+  if (complete && hasLeft && !hasRight) {
+    return 'left';
+  }
+  return 'undirected';
+}
+
 export const rulesDefiningVariables = [
   CypherParser.RULE_returnItem,
   CypherParser.RULE_unwindClause,

packages/language-support/src/labelTreeRewriting.ts

@@ -19,7 +19,7 @@ function copyLabelTree(labelTree: LabelOrCondition): LabelOrCondition {
 /**
  * Takes a label tree with an AND-root and converts it to Conjunctive Normal Form
  * @param root - the original label tree
- * @returns a an equivalent CNF tree
+ * @returns an equivalent CNF tree
  */
 export function convertToCNF(root: LabelOrCondition): LabelOrCondition {
   if (isLabelLeaf(root) || !(root.condition === 'and')) {
@@ -595,9 +595,12 @@ export function pushInNots(labelTree: LabelOrCondition): LabelOrCondition {
 }
 
 export const isAnyNode = (n: LabelOrCondition) =>
-  !isLabelLeaf(n) && n.condition === 'any';
+  !isLabelLeaf(n) && n.condition === 'any' && n.children.length === 0;
 export const isNotAnyNode = (n: LabelOrCondition) =>
-  !isLabelLeaf(n) && n.condition === 'not' && isAnyNode(n.children[0]);
+  !isLabelLeaf(n) &&
+  n.condition === 'not' &&
+  n.children.length === 1 &&
+  isAnyNode(n.children[0]);
 
 /**
  * Converts a label tree with ANYs to one without ANYs by simplifying like