@mirascript/monaco 0.1.7 → 0.1.10

package/dist/lsp/providers/definition-reference-provider.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"definition-reference-provider.d.ts","sourceRoot":"","sources":["../../../src/lsp/providers/definition-reference-provider.ts"],"names":[],"mappings":"AACA,OAAO,EACH,MAAM,EAEN,KAAK,SAAS,EACd,KAAK,iBAAiB,EAEtB,KAAK,QAAQ,EAEhB,MAAM,qBAAqB,CAAC;AAC7B,OAAO,EAAE,QAAQ,EAAE,MAAM,WAAW,CAAC;AAIrC;;GAEG;AACH,qBAAa,2BACT,SAAQ,QACR,YAAW,SAAS,CAAC,kBAAkB,EAAE,SAAS,CAAC,iBAAiB;IAGhE,OAAO,CAAC,QAAQ,CAAC,WAAW;gBAAX,WAAW,oBAAmF;IAInH,eAAe;IACf,OAAO,CAAC,aAAa;IAuBrB,kBAAkB;IACZ,iBAAiB,CACnB,KAAK,EAAE,MAAM,CAAC,UAAU,EACxB,QAAQ,EAAE,QAAQ,EAClB,KAAK,EAAE,iBAAiB,GACzB,OAAO,CAAC,SAAS,CAAC,YAAY,EAAE,GAAG,SAAS,CAAC;IAsBhD,kBAAkB;IACZ,iBAAiB,CACnB,KAAK,EAAE,MAAM,CAAC,UAAU,EACxB,QAAQ,EAAE,QAAQ,EAClB,OAAO,EAAE,SAAS,CAAC,gBAAgB,EACnC,KAAK,EAAE,iBAAiB,GACzB,OAAO,CAAC,SAAS,CAAC,QAAQ,EAAE,GAAG,SAAS,CAAC;CAuB/C"}
+{"version":3,"file":"definition-reference-provider.d.ts","sourceRoot":"","sources":["../../../src/lsp/providers/definition-reference-provider.ts"],"names":[],"mappings":"AAAA,OAAO,EACH,MAAM,EAEN,KAAK,SAAS,EACd,KAAK,iBAAiB,EAEtB,KAAK,QAAQ,EAEhB,MAAM,qBAAqB,CAAC;AAC7B,OAAO,EAAE,QAAQ,EAAE,MAAM,WAAW,CAAC;AAGrC;;GAEG;AACH,qBAAa,2BACT,SAAQ,QACR,YAAW,SAAS,CAAC,kBAAkB,EAAE,SAAS,CAAC,iBAAiB;IAGhE,OAAO,CAAC,QAAQ,CAAC,WAAW;gBAAX,WAAW,oBAI3B;IAIL,eAAe;YACD,aAAa;IAuB3B,kBAAkB;IACZ,iBAAiB,CACnB,KAAK,EAAE,MAAM,CAAC,UAAU,EACxB,QAAQ,EAAE,QAAQ,EAClB,KAAK,EAAE,iBAAiB,GACzB,OAAO,CAAC,SAAS,CAAC,YAAY,EAAE,GAAG,SAAS,CAAC;IA4BhD,kBAAkB;IACZ,iBAAiB,CACnB,KAAK,EAAE,MAAM,CAAC,UAAU,EACxB,QAAQ,EAAE,QAAQ,EAClB,OAAO,EAAE,SAAS,CAAC,gBAAgB,EACnC,KAAK,EAAE,iBAAiB,GACzB,OAAO,CAAC,SAAS,CAAC,QAAQ,EAAE,GAAG,SAAS,CAAC;CAqB/C"}

package/dist/lsp/providers/hover-provider.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"hover-provider.d.ts","sourceRoot":"","sources":["../../../src/lsp/providers/hover-provider.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,EAA2B,SAAS,EAAE,QAAQ,EAAE,MAAM,qBAAqB,CAAC;AACnH,OAAO,EAAE,QAAQ,EAAE,MAAM,WAAW,CAAC;AAKrC,kBAAkB;AAClB,qBAAa,aAAc,SAAQ,QAAS,YAAW,SAAS,CAAC,aAAa;IAC1E,WAAW;YACG,oBAAoB;IAiGlC,WAAW;YACG,iBAAiB;IAmB/B,kBAAkB;IACZ,YAAY,CACd,KAAK,EAAE,MAAM,CAAC,UAAU,EACxB,QAAQ,EAAE,QAAQ,EAClB,KAAK,EAAE,iBAAiB,EACxB,OAAO,CAAC,EAAE,SAAS,CAAC,YAAY,CAAC,SAAS,CAAC,KAAK,CAAC,GAClD,OAAO,CAAC,SAAS,CAAC,KAAK,GAAG,SAAS,CAAC;CAqB1C"}
+{"version":3,"file":"hover-provider.d.ts","sourceRoot":"","sources":["../../../src/lsp/providers/hover-provider.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,EAA2B,SAAS,EAAE,QAAQ,EAAE,MAAM,qBAAqB,CAAC;AACnH,OAAO,EAAE,QAAQ,EAAE,MAAM,WAAW,CAAC;AAKrC,kBAAkB;AAClB,qBAAa,aAAc,SAAQ,QAAS,YAAW,SAAS,CAAC,aAAa;IAC1E,WAAW;YACG,oBAAoB;IAiGlC,WAAW;YACG,iBAAiB;IAmB/B,kBAAkB;IACZ,YAAY,CACd,KAAK,EAAE,MAAM,CAAC,UAAU,EACxB,QAAQ,EAAE,QAAQ,EAClB,KAAK,EAAE,iBAAiB,EACxB,OAAO,CAAC,EAAE,SAAS,CAAC,YAAY,CAAC,SAAS,CAAC,KAAK,CAAC,GAClD,OAAO,CAAC,SAAS,CAAC,KAAK,GAAG,SAAS,CAAC;CAS1C"}

package/dist/lsp/utils.d.ts

@@ -1,5 +1,5 @@
 import { type editor, Range, type IPosition, type IRange } from '../monaco-api.js';
-import { type VmAny, type VmFunctionInfo, type VmValue } from '@mirascript/mirascript';
+import { type VmAny, type VmFunctionInfo } from '@mirascript/mirascript';
 import type { LocalDefinition } from './compile-result.js';
 /** 参数签名 */
 export type ParamSignature = [name: string, sig: string, doc: string];
@@ -25,13 +25,13 @@ export declare function wordAt(model: editor.ITextModel, position: IPosition): {
     word: string;
     range: Range;
 } | undefined;
-/** 将值序列化为便于展示的字符串 */
-export declare function serializeForDisplay(value: VmValue, maxEntries?: number, maxWidth?: number): string;
+/** 生成 doc comment */
+export declare function docComment(doc: string[]): string[];
 /** 获取变量文档 */
 export declare function valueDoc(name: string, value: VmAny, type: 'field' | 'declare' | 'hint'): {
     script: string;
     doc: string[];
 };
 /** 获取深层属性 */
-export declare function getDeep(value: VmAny, path: readonly string[]): VmValue;
+export declare function getDeep(value: VmAny, path: readonly string[]): VmAny;
 //# sourceMappingURL=utils.d.ts.map

package/dist/lsp/utils.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../src/lsp/utils.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,KAAK,MAAM,EAAE,KAAK,EAAE,KAAK,SAAS,EAAE,KAAK,MAAM,EAAE,MAAM,kBAAkB,CAAC;AACnF,OAAO,EASH,KAAK,KAAK,EACV,KAAK,cAAc,EACnB,KAAK,OAAO,EACf,MAAM,wBAAwB,CAAC;AAEhC,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,qBAAqB,CAAC;AAE3D,WAAW;AACX,MAAM,MAAM,cAAc,GAAG,CAAC,IAAI,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM,CAAC,CAAC;AAmBtE,aAAa;AACb,wBAAgB,WAAW,CACvB,EAAE,EAAE,MAAM,GAAG,SAAS,EACtB,IAAI,EAAE,cAAc,GACrB;IACC,MAAM,EAAE,cAAc,EAAE,CAAC;IACzB,OAAO,EAAE,MAAM,CAAC;IAChB,kBAAkB;IAClB,QAAQ,IAAI,MAAM,CAAC;CACtB,CAqBA;AACD,aAAa;AACb,wBAAgB,mBAAmB,CAC/B,KAAK,EAAE,MAAM,CAAC,UAAU,EACxB,IAAI,EAAE,WAAW,CAAC,eAAe,CAAC,IAAI,CAAC,CAAC,GACzC,cAAc,EAAE,CAqBlB;AAED,eAAe;AACf,wBAAgB,UAAU,CAAC,KAAK,EAAE,MAAM,CAAC,UAAU,EAAE,IAAI,EAAE,cAAc,GAAG,eAAe,CAAC,IAAI,CAAC,GAAG,SAAS,GAAG,MAAM,CAWrH;AAED,aAAa;AACb,wBAAgB,WAAW,CAAC,IAAI,EAAE,cAAc,GAAG,MAAM,EAAE,CA0B1D;AAED,kBAAkB;AAClB,wBAAgB,SAAS,CAAC,KAAK,EAAE,MAAM,GAAG,MAAM,CAI/C;AAED,uBAAuB;AACvB,wBAAgB,sBAAsB,CAAC,KAAK,EAAE,MAAM,EAAE,QAAQ,EAAE,SAAS,GAAG,OAAO,CAElF;AAED,WAAW;AACX,wBAAgB,MAAM,CAAC,KAAK,EAAE,MAAM,CAAC,UAAU,EAAE,QAAQ,EAAE,SAAS,GAAG;IAAE,IAAI,EAAE,MAAM,CAAC;IAAC,KAAK,EAAE,KAAK,CAAA;CAAE,GAAG,SAAS,CAKhH;AA2BD,qBAAqB;AACrB,wBAAgB,mBAAmB,CAAC,KAAK,EAAE,OAAO,EAAE,UAAU,SAAM,EAAE,QAAQ,SAAK,GAAG,MAAM,CA4D3F;AAED,aAAa;AACb,wBAAgB,QAAQ,CACpB,IAAI,EAAE,MAAM,EACZ,KAAK,EAAE,KAAK,EACZ,IAAI,EAAE,OAAO,GAAG,SAAS,GAAG,MAAM,GACnC;IAAE,MAAM,EAAE,MAAM,CAAC;IAAC,GAAG,EAAE,MAAM,EAAE,CAAA;CAAE,CA2DnC;AAED,aAAa;AACb,wBAAgB,OAAO,CAAC,KAAK,EAAE,KAAK,EAAE,IAAI,EAAE,SAAS,MAAM,EAAE,GAAG,OAAO,CAOtE"}
+{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../src/lsp/utils.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,KAAK,MAAM,EAAE,KAAK,EAAE,KAAK,SAAS,EAAE,KAAK,MAAM,EAAE,MAAM,kBAAkB,CAAC;AACnF,OAAO,EASH,KAAK,KAAK,EAEV,KAAK,cAAc,EAGtB,MAAM,wBAAwB,CAAC;AAEhC,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,qBAAqB,CAAC;AAE3D,WAAW;AACX,MAAM,MAAM,cAAc,GAAG,CAAC,IAAI,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM,CAAC,CAAC;AAmBtE,aAAa;AACb,wBAAgB,WAAW,CACvB,EAAE,EAAE,MAAM,GAAG,SAAS,EACtB,IAAI,EAAE,cAAc,GACrB;IACC,MAAM,EAAE,cAAc,EAAE,CAAC;IACzB,OAAO,EAAE,MAAM,CAAC;IAChB,kBAAkB;IAClB,QAAQ,IAAI,MAAM,CAAC;CACtB,CAqBA;AACD,aAAa;AACb,wBAAgB,mBAAmB,CAC/B,KAAK,EAAE,MAAM,CAAC,UAAU,EACxB,IAAI,EAAE,WAAW,CAAC,eAAe,CAAC,IAAI,CAAC,CAAC,GACzC,cAAc,EAAE,CAqBlB;AAED,eAAe;AACf,wBAAgB,UAAU,CAAC,KAAK,EAAE,MAAM,CAAC,UAAU,EAAE,IAAI,EAAE,cAAc,GAAG,eAAe,CAAC,IAAI,CAAC,GAAG,SAAS,GAAG,MAAM,CAWrH;AAED,aAAa;AACb,wBAAgB,WAAW,CAAC,IAAI,EAAE,cAAc,GAAG,MAAM,EAAE,CA0B1D;AAED,kBAAkB;AAClB,wBAAgB,SAAS,CAAC,KAAK,EAAE,MAAM,GAAG,MAAM,CAK/C;AAED,uBAAuB;AACvB,wBAAgB,sBAAsB,CAAC,KAAK,EAAE,MAAM,EAAE,QAAQ,EAAE,SAAS,GAAG,OAAO,CAElF;AAED,WAAW;AACX,wBAAgB,MAAM,CAAC,KAAK,EAAE,MAAM,CAAC,UAAU,EAAE,QAAQ,EAAE,SAAS,GAAG;IAAE,IAAI,EAAE,MAAM,CAAC;IAAC,KAAK,EAAE,KAAK,CAAA;CAAE,GAAG,SAAS,CAKhH;AA0GD,qBAAqB;AACrB,wBAAgB,UAAU,CAAC,GAAG,EAAE,MAAM,EAAE,GAAG,MAAM,EAAE,CAMlD;AAED,aAAa;AACb,wBAAgB,QAAQ,CACpB,IAAI,EAAE,MAAM,EACZ,KAAK,EAAE,KAAK,EACZ,IAAI,EAAE,OAAO,GAAG,SAAS,GAAG,MAAM,GACnC;IAAE,MAAM,EAAE,MAAM,CAAC;IAAC,GAAG,EAAE,MAAM,EAAE,CAAA;CAAE,CAoDnC;AAED,aAAa;AACb,wBAAgB,OAAO,CAAC,KAAK,EAAE,KAAK,EAAE,IAAI,EAAE,SAAS,MAAM,EAAE,GAAG,KAAK,CAQpE"}

package/package.json

@@ -1,8 +1,10 @@
 {
   "name": "@mirascript/monaco",
-  "version": "0.1.7",
-  "type": "module",
+  "version": "0.1.10",
+  "author": "CloudPSS",
+  "license": "MIT",
   "description": "Monaco Editor integration for Mirascript.",
+  "type": "module",
   "main": "./dist/index.js",
   "types": "./dist/index.d.ts",
   "exports": {
@@ -26,8 +28,8 @@
     }
   },
   "dependencies": {
-    "@mirascript/mirascript": "~0.1.7",
-    "@mirascript/wasm": "~0.1.7"
+    "@mirascript/wasm": "~0.1.10",
+    "@mirascript/mirascript": "~0.1.10"
   },
   "peerDependencies": {
     "monaco-editor": ">= 0.0.40 < 0.55.0"

package/src/basic/language-configuration.ts

@@ -14,7 +14,7 @@ function indentAction(action: keyof typeof languages.IndentAction): { indentActi
 
 export const configuration = (): languages.LanguageConfiguration => ({
     comments: {
-        lineComment: '//',
+        lineComment: { comment: '//' },
         blockComment: ['/*', '*/'],
     },
     brackets: [
@@ -86,5 +86,6 @@ export function setLanguageConfiguration(): IDisposable[] {
     return [
         languages.setLanguageConfiguration('mirascript', configuration()),
         languages.setLanguageConfiguration('mirascript-template', configuration()),
+        languages.setLanguageConfiguration('mirascript-doc', configuration()),
     ];
 }

package/src/basic/tokens-provider.ts

@@ -7,13 +7,16 @@ import {
     REG_HEX,
     REG_NUMBER,
     REG_IDENTIFIER,
-    DOC_HEADER,
     MAX_VERBATIM_LENGTH,
     constantKeywords,
     controlKeywords,
     keywords,
     numericKeywords,
 } from '../constants.js';
+import { lib } from '@mirascript/mirascript/subtle';
+import { isVmModule } from '@mirascript/mirascript';
+
+const moduleNames = Object.keys(lib).filter((name) => isVmModule(lib[name as never]));
 
 /** 匹配 identifier */
 function identifierCases(
@@ -23,7 +26,7 @@ function identifierCases(
     return {
         '@numericKeywords': { ...data, token: `constant.numeric` },
         '@constantKeywords': { ...data, token: `constant.language` },
-        '@controlKeywords': { ...data, token: `keyword.control` },
+        '@controlKeywords': { ...data, token: `keyword.flow` },
         '@keywords': { ...data, token: `keyword` },
         '[@]+.*': { ...data, token: `variable.other.constant` },
         '~it': { ...data, token: `variable.other.constant.emphasis` },
@@ -46,7 +49,6 @@ function getTokensProvider(mode: string): languages.IMonarchLanguage {
 
         whitespace: REG_WHITESPACE,
         identifier: REG_IDENTIFIER,
-        docHeader: DOC_HEADER,
 
         keywords: keywords(),
         controlKeywords: controlKeywords(),
@@ -54,34 +56,30 @@ function getTokensProvider(mode: string): languages.IMonarchLanguage {
         numericKeywords: numericKeywords(),
 
         inlineDocParam: /\(parameter(?: pattern)?\)/,
+        inlineDocMod: ['local', 'global', 'field', 'module'].join('|'),
 
-        start: mode === 'template' ? 'root_template' : 'root',
+        start: mode === 'template' ? 'root_template' : mode === 'doc' ? 'root_doc' : 'root',
         tokenPostfix: '.mirascript',
         tokenizer: {
-            root: [
-                [/^(?=\0)/, '', '@doc_mode'],
-                [/^\/\*\*@docHeader\*\*\/$/, 'comment.doc', '@doc_mode'],
-                [/[[\](){}]/, '@brackets'],
-                { include: '@common' },
-            ],
+            root: [[/[[\](){}]/, '@brackets'], { include: '@common' }],
             root_template: [
                 [/[^$]+/, 'string'],
                 [/(?=\$)/, '', '@string_interpolation.$S3'],
                 [/[$]/, 'string'],
             ],
             common: [
-                [/(@identifier)(@whitespace*)(\??:)(?!:)/, ['support.type.property-name', '', 'delimiter']],
+                [/(@identifier)(@whitespace*)(\??:)(?!:)/, ['variable.other.property', '', 'delimiter']],
                 [
                     /(fn)(@whitespace+)(@identifier)(?=$|@whitespace|[[({,;])/,
                     ['keyword', '', { cases: identifierCases(undefined, 'entity.name.function') }],
                 ],
                 [
                     /(for)(@whitespace+)(mut)(@whitespace+)(@identifier)(@whitespace+)(in)/,
-                    ['keyword.control', '', 'keyword', '', { cases: identifierCases() }, '', 'keyword.control'],
+                    ['keyword.flow', '', 'keyword', '', { cases: identifierCases() }, '', 'keyword.flow'],
                 ],
                 [
                     /(for)(@whitespace+)(@identifier)(@whitespace+)(in)/,
-                    ['keyword.control', '', { cases: identifierCases() }, '', 'keyword.control'],
+                    ['keyword.flow', '', { cases: identifierCases() }, '', 'keyword.flow'],
                 ],
                 [
                     /(\.)(@whitespace*)(\d+)/,
@@ -96,6 +94,7 @@ function getTokensProvider(mode: string): languages.IMonarchLanguage {
                         },
                     ],
                 ],
+                [String.raw`\b(${moduleNames.join('|')})(@whitespace*(?=!?\.))`, ['type', '']],
                 [
                     /(\.)(@whitespace*)(@identifier)(@whitespace*)(!?)(@whitespace*(?=\())/,
                     ['delimiter', '', 'entity.name.function', '', 'delimiter', ''],
@@ -254,28 +253,68 @@ function getTokensProvider(mode: string): languages.IMonarchLanguage {
                 [/[*@\\]/, { token: 'comment.doc' }],
             ],
 
-            doc_mode: [
+            root_doc: [
                 // inline doc, start with `\0`
+                [/^\0/, { token: '', switchTo: '@inline_doc' }],
+                [/(?=.)/, { token: '', switchTo: '@doc_mode' }],
+            ],
+
+            inline_doc: [
                 [
-                    /^(\0@inlineDocParam)(@whitespace+)(\.\.|)(mut)(@whitespace+)(@identifier)/,
+                    /(@inlineDocParam)(@whitespace+)(\.\.|)(mut)(@whitespace+)(@identifier)/,
                     ['entity.name.label', '', 'delimiter', 'keyword.mut', '', 'variable.emphasis'],
                 ],
                 [
-                    /^(\0@inlineDocParam)(@whitespace+)(\.\.|)(@identifier)/,
+                    /(@inlineDocParam)(@whitespace+)(\.\.|)(@identifier)/,
                     ['entity.name.label', '', 'delimiter', 'variable.other.constant.emphasis'],
                 ],
-                [/^(\0\(@identifier\))(@whitespace+)/, ['entity.name.label', '']],
+                [/(@whitespace*)(\(module\))(\s*)(@identifier)/, ['', 'entity.name.label', '', 'type']],
+                [/(\(@inlineDocMod\))(@whitespace+)/, ['entity.name.label', '']],
+                { include: '@doc_mode' },
+            ],
 
+            doc_mode: [
                 [
-                    /(@identifier)(@whitespace*)(:)(@whitespace*)(\/\*@whitespace*<)(extern )([.\w]*Function)(>@whitespace*\*\/)/,
+                    /(@identifier)(@whitespace*)(:)(@whitespace*)(\/\*@whitespace*<)(extern )((?:async )?function\*?)(@whitespace*)([<>.\w]*)(\(\))(>@whitespace*\*\/)/,
                     [
                         'entity.name.function.doc',
                         '',
                         'delimiter',
                         '',
                         'comment.doc',
-                        'type',
-                        'entity.name.label',
+                        'type.doc',
+                        'keyword.javascript',
+                        '',
+                        'entity.name.function.javascript',
+                        'delimiter',
+                        'comment.doc',
+                    ],
+                ],
+                [
+                    /(@identifier)(@whitespace*)(:)(@whitespace*)(\/\*@whitespace*<)(extern )(class)(@whitespace*)([<>.\w]*)(>@whitespace*\*\/)/,
+                    [
+                        'type.doc',
+                        '',
+                        'delimiter',
+                        '',
+                        'comment.doc',
+                        'type.doc',
+                        'keyword.javascript',
+                        '',
+                        'type.javascript',
+                        'comment.doc',
+                    ],
+                ],
+                [
+                    /(@identifier)(@whitespace*)(:)(@whitespace*)(\/\*@whitespace*<)(extern )([\w]*)(>@whitespace*\*\/)/,
+                    [
+                        'variable.other.property.doc',
+                        '',
+                        'delimiter',
+                        '',
+                        'comment.doc',
+                        'type.doc',
+                        'type.javascript',
                         'comment.doc',
                     ],
                 ],
@@ -287,72 +326,73 @@ function getTokensProvider(mode: string): languages.IMonarchLanguage {
                         'delimiter',
                         '',
                         'comment.doc',
-                        'type',
+                        'type.doc',
                         'entity.name.label',
                         'comment.doc',
                     ],
                 ],
-                [/(@identifier)(@whitespace*)(:)(@whitespace+)/, ['support.type.property-name', '', 'delimiter', '']],
+                [/(@identifier)(@whitespace*)(:)(@whitespace+)/, ['variable.other.property', '', 'delimiter', '']],
+
+                [
+                    /(\/\*@whitespace*<)(extern )((?:async )?function\*?)(@whitespace*)([<>.\w]*)(\(\))(>@whitespace*\*\/)/,
+                    [
+                        'comment.doc',
+                        'type.doc',
+                        'keyword.javascript',
+                        '',
+                        'entity.name.function.javascript',
+                        'delimiter',
+                        'comment.doc',
+                    ],
+                ],
+                [
+                    /(\/\*@whitespace*<)(extern )(class)(@whitespace*)([<>.\w]*)(>@whitespace*\*\/)/,
+                    ['comment.doc', 'type.doc', 'keyword.javascript', '', 'type.javascript', 'comment.doc'],
+                ],
+                [
+                    /(\/\*@whitespace*<)(extern )([\w]*)(>@whitespace*\*\/)/,
+                    ['comment.doc', 'type.doc', 'type.javascript', 'comment.doc'],
+                ],
+                [
+                    /(\/\*@whitespace*<)(function )([.\w]*)(>@whitespace*\*\/)/,
+                    ['comment.doc', 'type.doc', 'entity.name.label', 'comment.doc'],
+                ],
                 [
                     /(\/\*@whitespace*<)(\w+@whitespace*)([.\w]*)(>@whitespace*\*\/)/,
-                    ['comment.doc', 'type', 'entity.name.label', 'comment.doc'],
+                    ['comment.doc', 'type.doc', 'entity.name.label', 'comment.doc'],
                 ],
-                [/(\s*)(\(module\))(\s*)(@identifier)/, ['', 'entity.name.label', '', 'entity.name.namespace']],
 
+                [/(let|const)(@whitespace+)(@identifier)/, [{ token: 'keyword.$1' }, '', 'variable.other.constant']],
                 [/(fn)(@whitespace+)(@identifier)$/, ['keyword.fn.doc', '', 'entity.name.function.doc']],
                 [
-                    /(fn)(@whitespace+)(@identifier)(\()(\.\.)(\))$/,
+                    /(fn)(@whitespace+)(@identifier)(\()(\.\.)(\))/,
                     ['keyword.fn.doc', '', 'entity.name.function.doc', '@brackets', 'delimiter', '@brackets'],
                 ],
-                [/fn/, 'keyword.fn.doc', '@type_doc_fn'],
                 [
-                    /(let)(@whitespace+)(mut)(@whitespace+)(@identifier)/,
-                    [{ token: 'keyword.$1' }, '', 'keyword.mut', '', { token: 'variable', next: '@root' }],
+                    /(fn)(@whitespace+)(@identifier)/,
+                    ['keyword.fn.doc', '', { token: 'entity.name.function.doc', next: '@type_doc' }],
                 ],
                 [
-                    /(let|const)(@whitespace+)(@identifier)/,
-                    [{ token: 'keyword.$1' }, '', { token: 'variable.other.constant', next: '@root' }],
+                    /(let)(@whitespace+)(mut)(@whitespace+)(@identifier)/,
+                    [{ token: 'keyword.$1' }, '', 'keyword.mut', '', 'variable'],
                 ],
-                { include: '@common' },
                 [/[[\](){}]/, '@brackets'],
+                { include: '@common' },
             ],
             type_doc: [
-                { include: '@type_doc_common' },
-                [/[,)]/, 'delimiter', '@pop'],
                 [/;/, { token: 'delimiter', next: '@pop', goBack: 1 }],
-            ],
-            type_doc_inner: [{ include: '@type_doc_common' }, [/[,;]/, 'delimiter']],
-            type_doc_common: [
-                [/fn\b/, 'type', '@type_doc_fn'],
+                [/(fn)(\()/, ['type', '@brackets']],
                 [/(type)(\()(@identifier)(\))/, ['type', '@brackets', 'variable.emphasis.doc', '@brackets']],
-                [/@identifier/, 'type'],
-                [/[[(]/, '@brackets', '@type_doc_inner'],
-                [/[\])]/, '@brackets', '@pop'],
-                [/[&|.]/, 'delimiter'],
-                [/->/, 'delimiter'],
-                [/@whitespace+/, ''],
-            ],
-            type_doc_fn: [
-                [/(@identifier)(\()/, ['entity.name.function.doc', '@brackets']],
-                [/@whitespace+/, ''],
-                [/(->)/, { token: 'delimiter', switchTo: '@type_doc' }],
                 [
-                    /(\.\.|)(@identifier)(\s*)(:|,|\))/,
-                    [
-                        'delimiter',
-                        'variable.emphasis.doc',
-                        '',
-                        {
-                            cases: {
-                                ':': { token: 'delimiter', next: '@type_doc' },
-                                '\\)': '@brackets',
-                                '@default': 'delimiter',
-                            },
-                        },
-                    ],
+                    /(@identifier)(:)(@whitespace*)(fn)(\()/,
+                    ['entity.name.function.emphasis.doc', 'delimiter', '', 'type', '@brackets'],
                 ],
-                [/[()]/, '@brackets'],
-                [/;/, { token: 'delimiter', next: '@pop', goBack: 1 }],
+                [/(@identifier)(:)/, ['variable.emphasis', 'delimiter']],
+                [/@identifier/, 'type'],
+                [/[&|.,]/, 'delimiter'],
+                [/->/, 'delimiter'],
+                [/[[\]()]/, '@brackets'],
+                { include: '@whitespace' },
             ],
         },
     };
@@ -363,5 +403,6 @@ export function registerMiraScriptTokensProvider(): IDisposable[] {
     return [
         languages.setMonarchTokensProvider('mirascript', getTokensProvider('script')),
         languages.setMonarchTokensProvider('mirascript-template', getTokensProvider('template')),
+        languages.setMonarchTokensProvider('mirascript-doc', getTokensProvider('doc')),
     ];
 }

package/src/constants.ts

@@ -49,8 +49,5 @@ export const REG_OCT = /0[oO][0-7_]*[0-7]/;
 export const REG_BIN = /0[bB][01_]*[01]/;
 export const REG_NUMBER = /\d[\d_]*(?:\.[\d_]+)?(?:[eE][+-]?[\d_]*\d)?/u;
 
-// Special characters
-export const DOC_HEADER = ' 𝙼𝚒𝚛𝚊𝚂𝚌𝚛𝚒𝚙𝚝 𝙶𝚕𝚘𝚋𝚊𝚕 𝙳𝚎𝚏𝚒𝚗𝚒𝚝𝚒𝚘𝚗𝚜 ';
-
 /** 基础语言服务支持的最大插值字符串 `$` 数量 */
 export const MAX_VERBATIM_LENGTH = 16;

package/src/contribute.ts

@@ -15,4 +15,11 @@ export function registerContribution(): void {
         aliases: ['MiraScriptTemplate', 'mirascript-template', 'miratpl'],
         mimetypes: ['text/x-mirascript-template'],
     });
+
+    languages.register({
+        id: 'mirascript-doc',
+        extensions: [],
+        aliases: [],
+        mimetypes: ['text/x-mirascript-doc'],
+    });
 }

package/src/lsp/providers/base.ts

@@ -1,9 +1,10 @@
 import type { VmContext } from '@mirascript/mirascript';
-import { DefaultVmContext } from '@mirascript/mirascript/subtle';
+import { DefaultVmContext, type IRange } from '@mirascript/mirascript/subtle';
 import type { VmContextProvider } from '../../index.js';
-import { type editor, Emitter, type IEvent } from '../../monaco-api.js';
-import type { CompileResult } from '../compile-result.js';
+import { type editor, Emitter, type IEvent, type IPosition } from '../../monaco-api.js';
+import type { CompileResult, FieldsAccessAt, VariableAccessAt } from '../compile-result.js';
 import { compile } from '../worker-helper.js';
+import { wordAt } from '../utils.js';
 
 let contextProvider: VmContextProvider | undefined;
 /** 设置全局变量提供者 */
@@ -24,6 +25,25 @@ export abstract class Provider {
     async getContext(model: editor.ITextModel): Promise<Readonly<VmContext>> {
         return (await contextProvider?.(model)) ?? DefaultVmContext;
     }
+    /** 获取当前位置的值 */
+    async getValueAt(
+        model: editor.ITextModel,
+        position: IPosition,
+    ): Promise<({ range: IRange } & ({ variable: VariableAccessAt } | { fields: FieldsAccessAt })) | undefined> {
+        const compiled = await this.getCompileResult(model);
+        if (!compiled) return undefined;
+        const d = compiled.variableAccessAt(model, position);
+        if (d) return { range: d.range, variable: d };
+        const word = wordAt(model, position);
+        if (word) {
+            const a = compiled.fieldAccessAt(model, {
+                lineNumber: position.lineNumber,
+                column: word.range.endColumn,
+            });
+            if (a) return { range: word.range, fields: a };
+        }
+        return undefined;
+    }
 
     readonly displayName = 'MiraScript LSP';
     readonly _debugDisplayName = 'MiraScript LSP';

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

@@ -192,7 +192,9 @@ interface CustomCompletionItem extends languages.CompletionItem {
 /** 构造 filterText */
 function filterText(key: string, char: string | undefined): string {
     if (char == null || key.startsWith(char)) return key;
-    return key.startsWith('@') || key.startsWith('$') ? key.slice(1) : key;
+    if (key.startsWith('@')) return key.replace(/^@+/, '');
+    if (key.startsWith('$')) return key.replace(/^\$+/, '');
+    return key;
 }
 
 /** 构造选项 */
@@ -316,11 +318,11 @@ export class CompletionItemProvider extends Provider implements languages.Comple
         const locals = new Set<string>();
         while (scope) {
             for (const { definition, fn } of scope.locals) {
-                const name = model.getValueInRange(definition.range);
+                const name =
+                    definition.code === DiagnosticCode.ParameterIt ? 'it' : model.getValueInRange(definition.range);
+                if (char && !name.toLowerCase().includes(char)) continue;
                 if (locals.has(name)) continue; // 子作用域可能会覆盖父作用域的变量
-                if (char && !name.toLowerCase().includes(char)) {
-                    continue;
-                }
+
                 locals.add(name);
                 suggestions.push({
                     insertText: name,

package/src/lsp/providers/definition-reference-provider.ts

@@ -1,4 +1,3 @@
-import type { VmAny } from '@mirascript/mirascript';
 import {
     editor,
     Uri,
@@ -9,8 +8,7 @@ import {
     Range,
 } from '../../monaco-api.js';
 import { Provider } from './base.js';
-import { valueDoc } from '../utils.js';
-import { DOC_HEADER } from '../../constants.js';
+import { docComment, getDeep, valueDoc } from '../utils.js';
 
 /**
  * 转到定义/引用
@@ -20,23 +18,27 @@ export class DefinitionReferenceProvider
     implements languages.DefinitionProvider, languages.ReferenceProvider
 {
     constructor(
-        private readonly globalModel = editor.createModel(``, 'mirascript', Uri.parse('mirascript:///lib/global.mira')),
+        private readonly globalModel = editor.createModel(
+            ``,
+            'mirascript-doc',
+            Uri.parse('mirascript:///lib/global.mira'),
+        ),
     ) {
         super();
     }
     /** 准备要显示的定义 */
-    private prepareGlobal(name: string, value: VmAny): { uri: Uri; range: IRange } {
+    private async prepareGlobal(
+        model: editor.ITextModel,
+        path: readonly string[],
+    ): Promise<{ uri: Uri; range: IRange } | undefined> {
         const { globalModel } = this;
-        const { script, doc } = valueDoc(name, value, 'declare');
-        const code = [
-            `/**${DOC_HEADER}**/`,
-            '',
-            `/**`,
-            ...doc.flatMap((sec) => sec.split('\n')).map((line) => ` * ${line}`),
-            ` */`,
-            script,
-            '',
-        ];
+        const globals = await this.getContext(model);
+        const [name, ...access] = path;
+        if (!globals.has(name!)) return undefined;
+        const value = getDeep(globals.get(name!), access);
+        if (value === undefined) return undefined;
+        const { script, doc } = valueDoc(path.at(-1)!, value, 'declare');
+        const code = ['', ...docComment(doc), script, ''];
         globalModel.setValue(code.join('\n'));
         return {
             uri: globalModel.uri,
@@ -54,26 +56,32 @@ export class DefinitionReferenceProvider
         position: Position,
         token: CancellationToken,
     ): Promise<languages.LocationLink[] | undefined> {
-        const compiled = await this.getCompileResult(model);
-        if (!compiled) return undefined;
-        const globals = await this.getContext(model);
-        const d = compiled.variableAccessAt(model, position);
-        if (!d) return [];
-        const { def, ref } = d;
-        let originSelectionRange;
-        if (ref != null) {
-            originSelectionRange = def.references[ref]?.range;
-        } else if ('definition' in def) {
-            originSelectionRange = def.definition.range;
-        }
-        let link: languages.LocationLink;
-        if ('name' in def) {
-            link = this.prepareGlobal(def.name, globals.get(def.name));
+        const value = await this.getValueAt(model, position);
+        if (!value) return undefined;
+        if ('variable' in value) {
+            const { def } = value.variable;
+            let link: languages.LocationLink | undefined;
+            if ('name' in def) {
+                link = await this.prepareGlobal(model, [def.name]);
+            } else {
+                link = { uri: model.uri, range: def.definition.range };
+            }
+            if (!link) return undefined;
+            link.originSelectionRange = value.range;
+            return [link];
         } else {
-            link = { uri: model.uri, range: def.definition.range };
+            const {
+                def: { def },
+                fields,
+            } = value.fields;
+            if ('name' in def) {
+                const link: languages.LocationLink | undefined = await this.prepareGlobal(model, [def.name, ...fields]);
+                if (!link) return undefined;
+                link.originSelectionRange = value.range;
+                return [link];
+            }
         }
-        link.originSelectionRange = originSelectionRange;
-        return [link];
+        return undefined;
     }
     /** @inheritdoc */
     async provideReferences(
@@ -82,26 +90,24 @@ export class DefinitionReferenceProvider
         context: languages.ReferenceContext,
         token: CancellationToken,
     ): Promise<languages.Location[] | undefined> {
-        const compiled = await this.getCompileResult(model);
-        if (!compiled) return undefined;
-        const globals = await this.getContext(model);
-        const d = compiled.variableAccessAt(model, position);
-        if (!d) return [];
-        const { def } = d;
-        const links: languages.Location[] = def.references.map((u) => ({
-            uri: model.uri,
-            range: u.range,
-        }));
-        if (context.includeDeclaration) {
-            if ('name' in def) {
-                links.push(this.prepareGlobal(def.name, globals.get(def.name)));
-            } else if (!Range.isEmpty(def.definition.range)) {
-                links.push({
-                    uri: model.uri,
-                    range: def.definition.range,
-                });
+        const value = await this.getValueAt(model, position);
+        if (!value) return undefined;
+        if ('variable' in value) {
+            const { def } = value.variable;
+            const links: languages.Location[] = def.references.map((u) => ({
+                uri: model.uri,
+                range: u.range,
+            }));
+            if (context.includeDeclaration) {
+                if ('name' in def) {
+                    const link = await this.prepareGlobal(model, [def.name]);
+                    if (link) links.push(link);
+                } else if (!Range.isEmpty(def.definition.range)) {
+                    links.push({ uri: model.uri, range: def.definition.range });
+                }
             }
+            return links;
         }
-        return links;
+        return undefined;
     }
 }