@fc-components/monaco-editor 0.1.26 → 0.1.27

package/dist/promql/completion/situation.d.ts

@@ -22,5 +22,6 @@ export declare type Situation = {
     labelName: string;
     betweenQuotes: boolean;
     otherLabels: Label[];
+    valueStartPos: number;
 };
 export declare function getSituation(text: string, pos: number): Situation | null;

package/dist/promql/index.d.ts

@@ -17,7 +17,6 @@ interface PromQLEditorProps {
     onEnter?: (value: string) => void;
     onBlur?: (value: string) => void;
     editorDidMount?: (editor: monacoTypes.editor.IStandaloneCodeEditor) => void;
-    debugEscKey?: boolean;
 }
 export default function PromQLEditor(props: PromQLEditorProps & DataProviderParams): React.JSX.Element;
 export {};

package/package.json

@@ -3,7 +3,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "version": "0.1.26",
+  "version": "0.1.27",
   "license": "MIT",
   "main": "dist/index.js",
   "module": "dist/monaco-editor.esm.js",

package/src/promql/completion/getCompletionProvider.ts

@@ -70,6 +70,20 @@ export function getCompletionProvider(monaco: Monaco, dataProvider: DataProvider
       // to stop it, we use a number-as-string sortkey,
       // so that monaco keeps the order we use
       const maxIndexDigits = items.length.toString().length;
+
+      // Determine the completion range based on situation type
+      let completionRange = range;
+      if (situation && situation.type === 'IN_LABEL_SELECTOR_WITH_LABEL_NAME' && situation.betweenQuotes) {
+        // For label values within quotes, replace from the start of the value to the current position
+        const valueStartPosition = model.getPositionAt(situation.valueStartPos);
+        completionRange = monaco.Range.lift({
+          startLineNumber: valueStartPosition.lineNumber,
+          endLineNumber: position.lineNumber,
+          startColumn: valueStartPosition.column,
+          endColumn: position.column,
+        });
+      }
+
       const suggestions: monacoTypes.languages.CompletionItem[] = items.map((item, index) => ({
         kind: getMonacoCompletionItemKind(item.type, monaco),
         label: item.label,
@@ -77,7 +91,7 @@ export function getCompletionProvider(monaco: Monaco, dataProvider: DataProvider
         detail: item.detail,
         documentation: item.documentation,
         sortText: index.toString().padStart(maxIndexDigits, '0'), // to force the order we have
-        range,
+        range: completionRange,
         command: item.triggerOnInsert
           ? {
               id: 'editor.action.triggerSuggest',

package/src/promql/completion/situation.ts

@@ -145,6 +145,7 @@ export type Situation =
       labelName: string;
       betweenQuotes: boolean;
       otherLabels: Label[];
+      valueStartPos: number;
     };
 
 type Resolver = {
@@ -335,6 +336,11 @@ function resolveLabelMatcher(node: SyntaxNode, text: string, _pos: number): Situ
   // - or an error node (like in `{job=^}`)
   const inStringNode = !node.type.isError;
 
+  // calculate where the value starts
+  // for string nodes, it's after the opening quote
+  // for error nodes, it's at the node start
+  const valueStartPos = inStringNode ? node.from + 1 : node.from;
+
   const parent = walk(node, [['parent', UnquotedLabelMatcher]]);
   if (parent === null) {
     return null;
@@ -370,6 +376,7 @@ function resolveLabelMatcher(node: SyntaxNode, text: string, _pos: number): Situ
       labelName,
       betweenQuotes: inStringNode,
       otherLabels,
+      valueStartPos,
     };
   }
 
@@ -381,6 +388,7 @@ function resolveLabelMatcher(node: SyntaxNode, text: string, _pos: number): Situ
     labelName,
     betweenQuotes: inStringNode,
     otherLabels,
+    valueStartPos,
   };
 }
 

package/src/promql/index.tsx

@@ -30,7 +30,6 @@ interface PromQLEditorProps {
   onEnter?: (value: string) => void;
   onBlur?: (value: string) => void;
   editorDidMount?: (editor: monacoTypes.editor.IStandaloneCodeEditor) => void;
-  debugEscKey?: boolean;
 }
 
 const PROMQL_LANG_ID = promLanguageDefinition.id;
@@ -104,7 +103,6 @@ export default function PromQLEditor(props: PromQLEditorProps & DataProviderPara
     onEnter,
     onBlur,
     editorDidMount,
-    debugEscKey = false,
   } = props;
   const autocompleteDisposeFun = useRef<(() => void) | null>(null);
   const containerRef = useRef<HTMLDivElement>(null);
@@ -213,22 +211,6 @@ export default function PromQLEditor(props: PromQLEditorProps & DataProviderPara
       '!suggestWidgetVisible && isEditorFocused' + id,
     );
 
-    editor.addCommand(
-      monaco.KeyCode.Escape,
-      () => {
-        if (debugEscKey) {
-          const suggestWidgetVisible = (editor as any)?._contextKeyService?.getContextKeyValue?.('suggestWidgetVisible');
-          // eslint-disable-next-line no-console
-          console.log('[PromQLEditor][ESC]', {
-            suggestWidgetVisible,
-            valueLength: editor.getValue().length,
-          });
-        }
-        editor.trigger('keyboard', 'hideSuggestWidget', {});
-      },
-      'suggestWidgetVisible && isEditorFocused' + id,
-    );
-
     // Initialize previous content tracking
     previousContentRef.current = editor.getValue();
     lastDeletionTriggerTimeRef.current = 0;