feat: completed provideSignatureHelp

Author: johnsoncodehk

src/monaco/code2monaco.ts

@@ -151,3 +151,27 @@ export function asLocation(definition: vscode.LocationLink): monaco.languages.Lo
 export function asUri(uri: vscode.URI): monaco.Uri {
     return monaco.Uri.parse(uri);
 }
+
+export function asSignatureHelp(signatureHelp: vscode.SignatureHelp): monaco.languages.SignatureHelp {
+    return {
+        signatures: signatureHelp.signatures.map(asSignatureInformation),
+        activeSignature: signatureHelp.activeSignature ?? 0,
+        activeParameter: signatureHelp.activeParameter ?? 0,
+    };
+}
+
+export function asSignatureInformation(signatureInformation: vscode.SignatureInformation): monaco.languages.SignatureInformation {
+    return {
+        label: signatureInformation.label,
+        documentation: signatureInformation.documentation,
+        parameters: signatureInformation.parameters ? signatureInformation.parameters.map(asParameterInformation) : [],
+        activeParameter: signatureInformation.activeParameter,
+    };
+}
+
+export function asParameterInformation(parameterInformation: vscode.ParameterInformation): monaco.languages.ParameterInformation {
+    return {
+        label: parameterInformation.label,
+        documentation: parameterInformation.documentation,
+    };
+}

src/monaco/ls.ts

@@ -248,30 +248,16 @@ export async function setupLs(modelsMap: Ref<Map<string, monaco.editor.ITextMode
         monaco.languages.registerSignatureHelpProvider(lang, {
             signatureHelpTriggerCharacters: ['(', ','],
             provideSignatureHelp: async (model, position) => {
-                const result = await ls.getSignatureHelp(model.uri.toString(), {
-                    line: position.lineNumber - 1,
-                    character: position.column - 1,
-                });
-                if (!result) {
-                    return undefined;
+                const codeResult = await ls.getSignatureHelp(
+                    model.uri.toString(),
+                    monaco2code.asPosition(position),
+                );
+                if (codeResult) {
+                    return {
+                        value: code2monaco.asSignatureHelp(codeResult),
+                        dispose: () => { },
+                    };
                 }
-
-                return {
-                    value: {
-                        signatures: result.signatures.map((x) => ({
-                            label: x.label,
-                            documentation: x.documentation,
-                            parameters:
-                                x.parameters?.map((y) => ({
-                                    label: y.label,
-                                    documentation: y.documentation,
-                                })) ?? [],
-                        })),
-                        activeSignature: result.activeSignature!,
-                        activeParameter: result.activeParameter!,
-                    },
-                    dispose: () => { },
-                };
             },
         }),
     );