Skip to content

Modern Docker Management, Designed for Everyone

fix: autocomplete inconsistencies in compose editor

Kyle Mendell2b82e7fb6e7d
diff --git a/frontend/src/lib/components/monaco-code-editor/editor.svelte b/frontend/src/lib/components/monaco-code-editor/editor.svelte
index 58268a0ff..34592af1d 100644
--- a/frontend/src/lib/components/monaco-code-editor/editor.svelte
+++ b/frontend/src/lib/components/monaco-code-editor/editor.svelte
@@ -100,6 +100,12 @@
fontSize: parseInt(fontSize.replace('px', '')),
minimap: { enabled: false },
scrollBeyondLastLine: false,
+ quickSuggestions: {
+ other: true,
+ comments: false,
+ strings: true
+ },
+ suggestOnTriggerCharacters: true,
fontFamily:
'"Geist Mono", ui-monospace, SFMono-Regular, Menlo, Monaco, Consolas, "Liberation Mono", "Courier New", monospace',
padding: { top: 10, bottom: 10 },
diff --git a/frontend/src/lib/components/monaco-code-editor/monaco.ts b/frontend/src/lib/components/monaco-code-editor/monaco.ts
index ae15a6591..548f2e132 100644
--- a/frontend/src/lib/components/monaco-code-editor/monaco.ts
+++ b/frontend/src/lib/components/monaco-code-editor/monaco.ts
@@ -45,16 +45,21 @@ export async function initShiki(monacoInstance: typeof monaco) {
// Register the themes from Shiki, and provide syntax highlighting for Monaco.
shikiToMonaco(highlighter, monacoInstance);
+
+ // Register providers after languages are guaranteed to be registered
+ registerProviders();
})();
return shikiPromise;
}
-// Register YAML language providers (only once, survives hot reload)
-const globalWithFlag = globalThis as typeof globalThis & { _yamlProvidersRegistered?: boolean };
-if (!globalWithFlag._yamlProvidersRegistered) {
- registerYamlProviders(monaco);
- globalWithFlag._yamlProvidersRegistered = true;
+// Register YAML language providers
+let yamlProviders: monaco.IDisposable[] = [];
+
+export function registerProviders() {
+ // Dispose existing providers if any
+ yamlProviders.forEach((p) => p.dispose());
+ yamlProviders = registerYamlProviders(monaco);
}
if (typeof window !== 'undefined') {
diff --git a/frontend/src/lib/components/monaco-code-editor/yaml-providers.ts b/frontend/src/lib/components/monaco-code-editor/yaml-providers.ts
index 68aab4037..50b214f9a 100644
--- a/frontend/src/lib/components/monaco-code-editor/yaml-providers.ts
+++ b/frontend/src/lib/components/monaco-code-editor/yaml-providers.ts
@@ -280,8 +280,24 @@ function getContext(model: Monaco.editor.ITextModel, position: Monaco.Position):
*/
export function registerYamlCompletionProvider(monaco: typeof Monaco) {
return monaco.languages.registerCompletionItemProvider('yaml', {
- triggerCharacters: [' ', ':'],
+ // Trigger on space, colon (to clear), dash (for lists), and dot
+ triggerCharacters: [' ', ':', '-', '.'],
provideCompletionItems: (model, position) => {
+ const lineContent = model.getLineContent(position.lineNumber);
+ const textBeforeCursor = lineContent.substring(0, position.column - 1);
+
+ // If we just typed a colon, return empty suggestions to clear the list.
+ // This prevents the "colon + enter" issue where it auto-completes the wrong thing.
+ if (textBeforeCursor.endsWith(':')) {
+ return { suggestions: [] };
+ }
+
+ // If there's a colon followed by a space, we're definitely in a value position.
+ // We don't have value completions yet, so return empty.
+ if (/: /.test(textBeforeCursor)) {
+ return { suggestions: [] };
+ }
+
const word = model.getWordUntilPosition(position);
const range = {
startLineNumber: position.lineNumber,
@@ -294,6 +310,7 @@ export function registerYamlCompletionProvider(monaco: typeof Monaco) {
const suggestions = schemaManager.getSuggestions(context).map((s) => ({
...s,
range,
+ kind: monaco.languages.CompletionItemKind.Property,
insertTextRules: s.insertText.includes('$') ? monaco.languages.CompletionItemInsertTextRule.InsertAsSnippet : undefined
}));