feat: Add completion/signature support for `PredefinedSignature.Boole…

…anOrAuto`
hangxingliu · Apr 28, 2024 · 3f83a24 · 3f83a24
1 parent 2ae7b89
commit 3f83a24
Show file tree

Hide file tree

Showing 3 changed files with 26 additions and 17 deletions.
diff --git a/src/docs/signature.ts b/src/docs/signature.ts
@@ -6,6 +6,18 @@ import { createMarkdown } from "../utils/vscode";
 import { ExtensionConfig } from "../config/vscode-config-loader";
 import { SignatureInformation } from "vscode";
 import { PredefinedSignature } from "../hint-data/types-manifest";
+import { RequiredDirectiveCompletionItem } from "../hint-data/types-runtime";
+
+export function genSignaturesCore(
+    directive: Readonly<Pick<RequiredDirectiveCompletionItem, "signatures">>,
+    config: Readonly<Pick<ExtensionConfig, "booleanStyle">>
+): ReadonlyArray<string> {
+    if (directive.signatures === PredefinedSignature.Boolean) return [config.booleanStyle.split("-").join("|")];
+    if (directive.signatures === PredefinedSignature.BooleanOrAuto)
+        return [config.booleanStyle.split("-").concat("auto").join("|")];
+    if (isNonEmptyArray(directive.signatures)) return directive.signatures;
+    return [];
+}
 
 export function genSignatureDocsForDirective(
     managers: HintDataManagers,
@@ -32,17 +44,11 @@ export function genSignatureDocsForDirective(
         if (directive.fix?.help) docsMarkdown += directive.fix.help;
         else docsMarkdown += docs ? docs.str.value : "";
 
-        const signStrings: string[] = [];
-        if (directive.signatures === PredefinedSignature.Boolean) {
-            signStrings.push(config.booleanStyle.split("-").join("|"));
-        } else if (isNonEmptyArray(directive.signatures)) {
-            signStrings.push(...signStrings);
-        }
-
+        let signStrings = genSignaturesCore(directive, config);
         if (!signStrings[0]) {
             let defaultSign = `${directive.directiveName}=`;
             if (section) defaultSign = `[${section.name}] ${defaultSign}`;
-            signStrings[0] = defaultSign;
+            signStrings = [defaultSign];
         }
         for (const signString of signStrings)
             signatures.push(new SignatureInformation(signString, createMarkdown(docsMarkdown)));

diff --git a/src/hint-data/manager/base.ts b/src/hint-data/manager/base.ts
@@ -105,6 +105,8 @@ export class HintDataManager {
             if (signatures) {
                 if (signatures === PredefinedSignature.Boolean) {
                     label.detail = " boolean";
+                } else if (signatures === PredefinedSignature.BooleanOrAuto) {
+                    label.detail = " boolean|auto";
                 } else {
                     label.detail = " " + signatures;
                 }
@@ -229,7 +231,7 @@ export class HintDataManager {
                 }
                 if (item.fixHelp || renames[i]) {
                     extraProps.fix = {
-                        help: item.fixHelp || item.docs || '',
+                        help: item.fixHelp || item.docs || "",
                         url: item.fixURL,
                         rename: renames[i],
                     };

diff --git a/src/vscode-completion.ts b/src/vscode-completion.ts
@@ -41,7 +41,6 @@ export class SystemdCompletionProvider implements CompletionItemProvider {
         "@",
     ];
     private fileTypeToSections: Array<Array<CompletionItem>> = [];
-    private booleanItems: CompletionItem[] | undefined;
     private podmanEnabled: boolean;
     constructor(private readonly config: ExtensionConfig, private readonly managers: HintDataManagers) {
         this.podmanEnabled = config.podmanCompletion;
@@ -68,22 +67,21 @@ export class SystemdCompletionProvider implements CompletionItemProvider {
             this.podmanEnabled = this.config.podmanCompletion;
             this.fileTypeToSections = [];
         }
-        this.booleanItems = undefined;
     };
 
     private readonly extendsValueEnum: ValueEnumExtendsFn = (rule) => {
-        if (rule.extends === PredefinedSignature.Boolean) return this.getBooleanCompletion();
+        if (rule.extends === PredefinedSignature.Boolean) return this.getBooleanCompletion(false);
+        if (rule.extends === PredefinedSignature.BooleanOrAuto) return this.getBooleanCompletion(true);
     };
 
-    getBooleanCompletion() {
-        if (this.booleanItems) return this.booleanItems;
+    getBooleanCompletion(withAuto: boolean) {
         const enums = this.config.booleanStyle.split("-");
-        this.booleanItems = enums.map((it, index) => {
+        if (withAuto) enums.push("auto");
+        return enums.map((it, index) => {
             const ci = new CompletionItem(it, CompletionItemKind.Keyword);
             ci.sortText = `bool${index}`;
             return ci;
         });
-        return this.booleanItems;
     }
 
     provideCompletionItems(
@@ -158,7 +156,10 @@ export class SystemdCompletionProvider implements CompletionItemProvider {
                     const list = this.managers.getDirectiveList(directive, { section, file });
                     if (list && list.length > 0) {
                         const directive = list[0];
-                        if (directive.signatures === PredefinedSignature.Boolean) return this.getBooleanCompletion();
+                        if (directive.signatures === PredefinedSignature.Boolean)
+                            return this.getBooleanCompletion(false);
+                        if (directive.signatures === PredefinedSignature.BooleanOrAuto)
+                            return this.getBooleanCompletion(true);
                     }
                 }
                 return;