@mirascript/monaco 0.1.39 → 0.1.41

package/src/lsp/providers/completion-item-provider.ts

@@ -10,6 +10,7 @@ import {
     serialize,
 } from '@mirascript/mirascript';
 import { DiagnosticCode } from '@mirascript/mirascript/subtle';
+import { KEYWORDS as HELP_KEYWORDS } from '@mirascript/help';
 import {
     type editor,
     languages,
@@ -20,17 +21,8 @@ import {
     Range,
 } from '../../monaco-api.js';
 import { Provider, type MonacoContext } from './base.js';
-import {
-    codeblock,
-    getDeep,
-    valueDoc,
-    paramsList,
-    strictContainsPosition,
-    wordAt,
-    getField,
-    listFields,
-    isDeprecatedGlobal,
-} from '../utils.js';
+import { strictContainsPosition, wordAt } from '../monaco-utils.js';
+import { codeblock, getDeep, valueDoc, paramsList, getField, listFields, isDeprecatedGlobal } from '../utils.js';
 import { KEYWORDS, RESERVED_KEYWORDS, REG_IDENTIFIER_FULL, REG_ORDINAL_FULL, isKeyword } from '../../constants.js';
 import type { LocalDefinition } from '../compile-result.js';
 
@@ -59,9 +51,7 @@ const COMMON_GLOBAL_SUGGESTIONS = (
             kind: languages.CompletionItemKind.Keyword,
             insertText: 'type',
             commitCharacters: ['('],
-            documentation: {
-                value: `使用 \`type()\` 调用获取表达式的类型。${codeblock('type(expression);\nexpression::type();')}`,
-            },
+            documentation: { value: HELP_KEYWORDS.type },
             range,
         },
         {
@@ -69,9 +59,7 @@ const COMMON_GLOBAL_SUGGESTIONS = (
             kind: languages.CompletionItemKind.Keyword,
             insertText: 'global',
             commitCharacters: ['.', '['],
-            documentation: {
-                value: `使用 \`global\` 获取全局变量。${codeblock('global.variableName;\nglobal["variableName"];\n"variableName" in global;')}`,
-            },
+            documentation: { value: HELP_KEYWORDS.global },
             range,
         },
     ];
@@ -183,10 +171,12 @@ const COMMON_GLOBAL_SUGGESTIONS = (
 
 /** 构造关键字选项 */
 function kwSuggestion(kw: string, range: languages.CompletionItemRanges): languages.CompletionItem {
+    const doc = (HELP_KEYWORDS as Record<string, string | undefined>)[kw];
     return {
         label: kw,
         kind: languages.CompletionItemKind.Keyword,
         insertText: kw,
+        documentation: doc ? { value: doc } : undefined,
         range,
     };
 }

package/src/lsp/providers/hover-provider.ts

@@ -1,8 +1,48 @@
-import type { CancellationToken, editor, IMarkdownString, IRange, languages, Position } from '../../monaco-api.js';
-import { Provider } from './base.js';
 import { DiagnosticCode } from '@mirascript/constants';
-import { codeblock, getDeep, valueDoc, paramsList } from '../utils.js';
+import { convert } from '@mirascript/mirascript/subtle';
+import { KEYWORDS as HELP_KEYWORDS, OPERATORS as HELP_OPERATORS } from '@mirascript/help';
+import { REG_BIN, REG_HEX, REG_NUMBER, REG_OCT } from '../../constants.js';
+import type { editor, CancellationToken, IMarkdownString, IRange, languages, Position } from '../../monaco-api.js';
+import { codeblock, getDeep, valueDoc, paramsList, serializeNumber, serializeInteger } from '../utils.js';
+import { tokenAt } from '../monaco-private.js';
+import { rangeAt } from '../monaco-utils.js';
 import type { FieldsAccessAt, VariableAccessAt } from '../compile-result.js';
+import { Provider } from './base.js';
+
+const OPERATOR_TOKENS_DESC = Object.keys(HELP_OPERATORS as Record<string, string>).sort((a, b) => b.length - a.length);
+const REG_NUMBER_ALL_FULL = new RegExp(
+    `^(?:${REG_BIN.source}|${REG_OCT.source}|${REG_HEX.source}|${REG_NUMBER.source})$`,
+    REG_NUMBER.flags,
+);
+
+const BIN_MAX = 2 ** 32 - 1;
+const OCT_MAX = 8 ** 18 - 1;
+const HEX_MAX = 16 ** 16 - 1;
+
+/** 在指定位置查找操作符 */
+function operatorAt(lineContent: string, column: number): { token: string; range: IRange } | undefined {
+    const index = Math.max(0, column - 1);
+    for (const token of OPERATOR_TOKENS_DESC) {
+        for (let offset = 0; offset < token.length; offset++) {
+            const start = index - offset;
+            if (start < 0) continue;
+            const end = start + token.length;
+            if (end > lineContent.length) continue;
+            if (lineContent.slice(start, end) !== token) continue;
+            if (index < start || index >= end) continue;
+            return {
+                token,
+                range: {
+                    startLineNumber: 0,
+                    startColumn: start + 1,
+                    endLineNumber: 0,
+                    endColumn: end + 1,
+                },
+            };
+        }
+    }
+    return undefined;
+}
 
 /** @inheritdoc */
 export class HoverProvider extends Provider implements languages.HoverProvider {
@@ -120,6 +160,79 @@ export class HoverProvider extends Provider implements languages.HoverProvider {
             range,
         };
     }
+
+    /** 语法元素提示 */
+    private provideSyntaxHover(model: editor.ITextModel, position: Position): languages.Hover | undefined {
+        const token = tokenAt(model, position);
+        if (token?.type && token.type !== 'other') {
+            return undefined;
+        }
+
+        if (token?.text) {
+            if (token.text in HELP_KEYWORDS) {
+                const doc = HELP_KEYWORDS[token.text as keyof typeof HELP_KEYWORDS];
+                return {
+                    contents: [{ value: doc }],
+                    range: rangeAt(position, token),
+                };
+            }
+
+            if (token.text in HELP_OPERATORS) {
+                const doc = HELP_OPERATORS[token.text as keyof typeof HELP_OPERATORS];
+                return {
+                    contents: [{ value: doc }],
+                    range: rangeAt(position, token),
+                };
+            }
+
+            if (REG_NUMBER_ALL_FULL.test(token.text)) {
+                const num = convert.toNumber(token.text.replaceAll('_', ''), null);
+                if (num == null) return undefined;
+                const contents: IMarkdownString[] = [
+                    { value: `数字字面量` },
+                    { value: codeblock('val: ' + serializeNumber(num)) },
+                ];
+                if (Number.isInteger(num)) {
+                    const abs = Math.abs(num);
+                    if (abs <= BIN_MAX) {
+                        contents.push({ value: codeblock('bin: ' + serializeInteger(num, 2)) });
+                    }
+                    if (abs <= OCT_MAX) {
+                        contents.push({ value: codeblock('oct: ' + serializeInteger(num, 8)) });
+                    }
+                    if (abs <= HEX_MAX) {
+                        contents.push({ value: codeblock('hex: ' + serializeInteger(num, 16)) });
+                    }
+                }
+                return {
+                    contents,
+                    range: rangeAt(position, token),
+                };
+            }
+        }
+
+        const word = model.getWordAtPosition(position);
+        if (word?.word && word.word in HELP_KEYWORDS) {
+            const doc = HELP_KEYWORDS[word.word as keyof typeof HELP_KEYWORDS];
+            return {
+                contents: [{ value: doc }],
+                range: rangeAt(position, word),
+            };
+        }
+
+        const lineContent = model.getLineContent(position.lineNumber);
+        const hit = operatorAt(lineContent, position.column);
+        if (hit && hit.token in HELP_OPERATORS) {
+            const doc = HELP_OPERATORS[hit.token as keyof typeof HELP_OPERATORS];
+            return {
+                contents: [{ value: doc }],
+                range: rangeAt(position, hit.range),
+            };
+        }
+
+        return undefined;
+    }
+
     /** @inheritdoc */
     async provideHover(
         model: editor.ITextModel,
@@ -128,8 +241,9 @@ export class HoverProvider extends Provider implements languages.HoverProvider {
         context?: languages.HoverContext<languages.Hover>,
     ): Promise<languages.Hover | undefined> {
         const value = await this.getValueAt(model, position);
-        if (!value) return undefined;
-        if ('fields' in value) {
+        if (!value) {
+            return this.provideSyntaxHover(model, position);
+        } else if ('fields' in value) {
             return this.provideFieldHover(model, value.range, value.fields);
         } else {
             return this.provideVariableHover(model, value.variable);

package/src/lsp/providers/signature-help-provider.ts

@@ -1,8 +1,9 @@
 import { DiagnosticCode } from '@mirascript/constants';
+import { getVmFunctionInfo } from '@mirascript/mirascript';
 import { type editor, type languages, type CancellationToken, Position, Range } from '../../monaco-api.js';
 import { Provider } from './base.js';
-import { fnSignature, getDeep, localParamSignature, strictContainsPosition } from '../utils.js';
-import { getVmFunctionInfo } from '@mirascript/mirascript';
+import { fnSignature, getDeep, localParamSignature } from '../utils.js';
+import { strictContainsPosition } from '../monaco-utils.js';
 
 /** @inheritdoc */
 export class SignatureHelpProvider extends Provider implements languages.SignatureHelpProvider {

package/src/lsp/utils.ts

@@ -1,5 +1,5 @@
 import { DiagnosticCode } from '@mirascript/constants';
-import { type editor, Range, type IPosition, type IRange } from '../monaco-api.js';
+import { type editor, Range } from '../monaco-api.js';
 import {
     getVmFunctionInfo,
     isVmArray,
@@ -155,17 +155,76 @@ export function codeblock(value: string): string {
     return `\n${CODEBLOCK_FENCE}${lang}\n${value}\n${CODEBLOCK_FENCE}\n`;
 }
 
-/** 检查位置是否在范围内，且范围非空 */
-export function strictContainsPosition(range: IRange, position: IPosition): boolean {
-    return !Range.isEmpty(range) && Range.containsPosition(range, position);
+/** 格式化数字 */
+function serializeIntegerImpl(num: number, base: number, prefix: string, sep: number): string {
+    let str = Math.abs(num).toString(base);
+    if (base > 10) str = str.toUpperCase();
+    const sepSize = Math.abs(sep);
+    if (sep !== 0 && str.length > sepSize) {
+        const seg = [];
+        if (sep > 0) {
+            while (str.length > sepSize) {
+                seg.unshift(str.slice(-sepSize));
+                str = str.slice(0, -sepSize);
+            }
+            if (str.length > 0) {
+                seg.unshift(str);
+            }
+        } else {
+            while (str.length > sepSize) {
+                seg.push(str.slice(0, sepSize));
+                str = str.slice(sepSize);
+            }
+            if (str.length > 0) {
+                seg.push(str);
+            }
+        }
+        str = seg.join('_');
+    }
+    return (num < 0 ? '-' : '') + prefix + str;
 }
 
-/** 获取单词 */
-export function wordAt(model: editor.ITextModel, position: IPosition): { word: string; range: Range } | undefined {
-    const word = model.getWordAtPosition(position);
-    if (!word) return undefined;
-    const range = new Range(position.lineNumber, word.startColumn, position.lineNumber, word.endColumn);
-    return { word: word.word, range };
+/** 格式化数字 */
+export function serializeInteger(num: number, base: 2 | 8 | 16, sep = true): string {
+    const prefix = base === 2 ? '0b' : base === 8 ? '0o' : '0x';
+    const sepSize = sep ? (base === 2 ? 8 : base === 8 ? 6 : 4) : 0;
+    return serializeIntegerImpl(num, base, prefix, sepSize);
+}
+
+/** 格式化数字 */
+export function serializeNumber(num: number): string {
+    if (!Number.isFinite(num)) {
+        return serialize(num);
+    }
+    const str = String(num);
+    const dot = str.indexOf('.');
+    const exp = str.indexOf('e');
+    let intPart: string;
+    let fracPart: string;
+    let expPart: string;
+    if (dot >= 0) {
+        intPart = str.slice(0, dot);
+        if (exp >= 0) {
+            fracPart = str.slice(dot + 1, exp);
+            expPart = str.slice(exp);
+        } else {
+            fracPart = str.slice(dot + 1);
+            expPart = '';
+        }
+    } else {
+        if (exp >= 0) {
+            intPart = str.slice(0, exp);
+            fracPart = '';
+            expPart = str.slice(exp);
+        } else {
+            intPart = str;
+            fracPart = '';
+            expPart = '';
+        }
+    }
+    if (intPart.length > 5) intPart = serializeIntegerImpl(Number(intPart), 10, '', 3);
+    if (fracPart.length > 5) fracPart = serializeIntegerImpl(Number(fracPart), 10, '', -3);
+    return intPart + (fracPart ? '.' + fracPart : '') + expPart;
 }
 
 /** 将值序列化为便于展示的字符串 */
@@ -177,6 +236,9 @@ function serializeForDisplayInner(value: VmValue, maxWidth: number): string {
         }
         return `${serializeString(value.slice(0, maxWidth))}..`;
     }
+    if (typeof value === 'number') {
+        return serializeNumber(value);
+    }
     if (isVmPrimitive(value)) {
         return serialize(value);
     }