fix jest tests

Author: salazarm

js_modules/dagster-ui/packages/ui-core/src/selection/SelectionAutoComplete.g4

@@ -46,7 +46,7 @@ incompleteExpr:
 	| leftParenToken postLogicalOperatorWhitespace expr		# UnclosedParenthesizedExpression
 	| expressionLessParenthesizedExpr						# ExpressionlessParenthesizedExpressionWrapper
 	| leftParenToken postLogicalOperatorWhitespace			# UnclosedExpressionlessParenthesizedExpression
-	| PLUS+ postNeighborTraversalWhitespace					# IncompletePlusTraversalExpression
+	| PLUS postNeighborTraversalWhitespace					# IncompletePlusTraversalExpression
 	| colonToken attributeValue postExpressionWhitespace	# IncompleteAttributeExpressionMissingKey;
 
 expressionLessParenthesizedExpr:

js_modules/dagster-ui/packages/ui-core/src/selection/SelectionAutoComplete.ts

@@ -43,6 +43,11 @@ export type Suggestion =
       displayText?: string;
       type: 'attribute';
       attributeName?: string;
+    }
+  | {
+      text: string;
+      displayText?: string;
+      type: 'traversal';
     };
 
 type TextCallback = (value: string) => string;
@@ -238,6 +243,7 @@ export class SelectionAutoCompleteVisitor
         text: textCallback(substringMatchText),
         displayText: substringMatchDisplayText,
         type: 'attribute' as const,
+        attributeName: `${this.nameBase}_substring`,
       });
     }
     this.addAttributeResults(value, textCallback);
@@ -268,13 +274,13 @@ export class SelectionAutoCompleteVisitor
         this.list.push({
           text: textCallback('+'),
           displayText: '+',
-          type: 'logical_operator' as const,
+          type: 'traversal' as const,
         });
       }
       this.list.push({
         text: textCallback('()'),
         displayText: '(',
-        type: 'function' as const,
+        type: 'parenthesis' as const,
       });
     }
   }
@@ -313,7 +319,7 @@ export class SelectionAutoCompleteVisitor
     );
 
     if (!options.excludePlus) {
-      this.list.push({text: '+', displayText: '+', type: 'logical_operator' as const});
+      this.list.push({text: '+', displayText: '+', type: 'traversal' as const});
     }
 
     if (isInsideExpressionlessParenthesizedExpression(ctx)) {
@@ -338,16 +344,16 @@ export class SelectionAutoCompleteVisitor
 
   visitUpTraversal(ctx: UpTraversalContext) {
     if (ctx.text.includes('+')) {
-      this.list.push({text: '+', displayText: '+', type: 'logical_operator' as const});
+      this.list.push({text: '+', displayText: '+', type: 'traversal' as const});
     }
-    this.list.push({text: '()', displayText: '(', type: 'function' as const});
+    this.list.push({text: '()', displayText: '(', type: 'parenthesis' as const});
   }
 
   visitDownTraversal(ctx: DownTraversalContext) {
     this.list.push({text: ' and ', displayText: 'and', type: 'logical_operator' as const});
     this.list.push({text: ' or ', displayText: 'or', type: 'logical_operator' as const});
     if (ctx.text.includes('+')) {
-      this.list.push({text: '+', displayText: '+', type: 'logical_operator' as const});
+      this.list.push({text: '+', displayText: '+', type: 'traversal' as const});
     }
     if (isInsideExpressionlessParenthesizedExpression(ctx)) {
       this.list.push({text: ')', displayText: ')', type: 'parenthesis' as const});
@@ -461,6 +467,7 @@ export class SelectionAutoCompleteVisitor
     }
     this.addUnmatchedValueResults('', DEFAULT_TEXT_CALLBACK, {
       excludeNot: true,
+      excludePlus: true,
     });
   }
 
@@ -484,7 +491,9 @@ export class SelectionAutoCompleteVisitor
   }
 
   visitPostNeighborTraversalWhitespace(_ctx: PostNeighborTraversalWhitespaceContext) {
-    this.addUnmatchedValueResults('', DEFAULT_TEXT_CALLBACK);
+    this.addUnmatchedValueResults('', DEFAULT_TEXT_CALLBACK, {
+      excludePlus: true,
+    });
   }
 
   visitPostUpwardTraversalWhitespace(_ctx: PostUpwardTraversalWhitespaceContext) {

js_modules/dagster-ui/packages/ui-core/src/selection/SelectionAutoCompleteInput.tsx

@@ -90,12 +90,15 @@ export const SelectionAutoCompleteInput = <T extends Record<string, string[]>, N
 
   const [selectedIndexRef, setSelectedIndex] = useState({current: 0});
 
+  const scrollToSelectionRef = useRef(false);
+
   useDangerousRenderEffect(() => {
     // Rather then using a useEffect + setState (extra render), we just set the current value directly
     selectedIndexRef.current = 0;
     if (!autocompleteResults?.list.length) {
       showResults.current = false;
     }
+    scrollToSelectionRef.current = true;
   }, [autocompleteResults]);
 
   const scheduleUpdateValue = useCallback(() => {
@@ -188,15 +191,6 @@ export const SelectionAutoCompleteInput = <T extends Record<string, string[]>, N
         applyStaticSyntaxHighlighting(cmInstance.current);
       });
     }
-
-    return () => {
-      const cm = cmInstance.current;
-      if (cm) {
-        // Clean up the instance...
-        cm.closeHint();
-        cm.getWrapperElement()?.parentNode?.removeChild(cm.getWrapperElement());
-      }
-    };
     // eslint-disable-next-line react-hooks/exhaustive-deps
   }, []);
 
@@ -265,8 +259,6 @@ export const SelectionAutoCompleteInput = <T extends Record<string, string[]>, N
     [autocompleteResults],
   );
 
-  const navigationTriggeredByKeyboard = useRef(false);
-
   const handleKeyDown = useCallback(
     (e: KeyboardEvent<HTMLDivElement>) => {
       if (!showResults) {
@@ -275,7 +267,7 @@ export const SelectionAutoCompleteInput = <T extends Record<string, string[]>, N
       scheduleUpdateValue();
 
       if (e.key === 'ArrowDown' || e.key === 'ArrowUp') {
-        navigationTriggeredByKeyboard.current = true;
+        scrollToSelectionRef.current = true;
       }
 
       if (e.key === 'ArrowDown') {
@@ -311,7 +303,7 @@ export const SelectionAutoCompleteInput = <T extends Record<string, string[]>, N
               results={autocompleteResults}
               width={width}
               selectedIndex={selectedIndexRef.current}
-              scrollOnNavigate={navigationTriggeredByKeyboard}
+              scrollToSelection={scrollToSelectionRef}
               onSelect={onSelect}
               scheduleUpdateValue={scheduleUpdateValue}
               setSelectedIndex={setSelectedIndex}

js_modules/dagster-ui/packages/ui-core/src/selection/SelectionAutoCompleteResults.tsx

@@ -14,7 +14,7 @@ type SelectionAutoCompleteResultsProps = {
   selectedIndex: number;
   setSelectedIndex: React.Dispatch<React.SetStateAction<{current: number}>>;
   scheduleUpdateValue: () => void;
-  scrollOnNavigate: MutableRefObject<boolean>;
+  scrollToSelection: MutableRefObject<boolean>;
 };
 
 export const SelectionAutoCompleteResults = ({
@@ -24,7 +24,7 @@ export const SelectionAutoCompleteResults = ({
   selectedIndex,
   scheduleUpdateValue,
   setSelectedIndex,
-  scrollOnNavigate,
+  scrollToSelection,
 }: SelectionAutoCompleteResultsProps) => {
   if (!results) {
     return null;
@@ -40,9 +40,9 @@ export const SelectionAutoCompleteResults = ({
             text={
               <div
                 ref={
-                  index === selectedIndex && scrollOnNavigate.current
+                  index === selectedIndex && scrollToSelection.current
                     ? (el) => {
-                        scrollOnNavigate.current = false;
+                        scrollToSelection.current = false;
                         if (el) {
                           el.scrollIntoView({
                             behavior: 'instant',