meaoiu 0.1.0 → 0.1.2
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/api/execution.d.ts +1 -1
- package/dist/api/execution.d.ts.map +1 -1
- package/dist/api/execution.js +3 -3
- package/dist/api/execution.js.map +1 -1
- package/dist/api/serviceState.d.ts.map +1 -1
- package/dist/api/serviceState.js +4 -7
- package/dist/api/serviceState.js.map +1 -1
- package/dist/api/services/completions.js +1 -1
- package/dist/api/services/completions.js.map +1 -1
- package/dist/api/services/formatting.d.ts.map +1 -1
- package/dist/api/services/formatting.js +27 -38
- package/dist/api/services/formatting.js.map +1 -1
- package/dist/api/services/inlayHints.d.ts +2 -2
- package/dist/api/services/inlayHints.d.ts.map +1 -1
- package/dist/api/services/inlayHints.js +2 -2
- package/dist/api/utils/astUtils.js +6 -6
- package/dist/api/utils/symbolAnalyzer.d.ts +1 -2
- package/dist/api/utils/symbolAnalyzer.d.ts.map +1 -1
- package/dist/api/utils/symbolAnalyzer.js +62 -47
- package/dist/api/utils/symbolAnalyzer.js.map +1 -1
- package/dist/api/utils/symbolTable.d.ts +3 -3
- package/dist/api/utils/symbolTable.d.ts.map +1 -1
- package/dist/cli/main.js +1 -1
- package/dist/cli/tools/completer.js +8 -4
- package/dist/cli/tools/completer.js.map +1 -1
- package/dist/cli/tools/diagnoser.js +2 -1
- package/dist/cli/tools/diagnoser.js.map +1 -1
- package/dist/cli/tools/starter.js +2 -1
- package/dist/cli/tools/starter.js.map +1 -1
- package/dist/core/ast.d.ts +14 -22
- package/dist/core/ast.d.ts.map +1 -1
- package/dist/core/builtIns.d.ts +4 -3
- package/dist/core/builtIns.d.ts.map +1 -1
- package/dist/core/builtIns.js +4 -6
- package/dist/core/builtIns.js.map +1 -1
- package/dist/core/error.d.ts +5 -12
- package/dist/core/error.d.ts.map +1 -1
- package/dist/core/error.js +9 -20
- package/dist/core/error.js.map +1 -1
- package/dist/core/lexer/preprocessor.d.ts.map +1 -0
- package/dist/core/{preprocessor.js → lexer/preprocessor.js} +1 -1
- package/dist/core/lexer/preprocessor.js.map +1 -0
- package/dist/core/lexer/tokenizer.d.ts +115 -0
- package/dist/core/lexer/tokenizer.d.ts.map +1 -0
- package/dist/core/lexer/tokenizer.js +295 -0
- package/dist/core/lexer/tokenizer.js.map +1 -0
- package/dist/core/parser.d.ts +2 -78
- package/dist/core/parser.d.ts.map +1 -1
- package/dist/core/parser.js +116 -104
- package/dist/core/parser.js.map +1 -1
- package/dist/core/run/environment.d.ts +3 -2
- package/dist/core/run/environment.d.ts.map +1 -1
- package/dist/core/run/environment.js +6 -7
- package/dist/core/run/environment.js.map +1 -1
- package/dist/core/run/interpreter.d.ts.map +1 -1
- package/dist/core/run/interpreter.js +60 -54
- package/dist/core/run/interpreter.js.map +1 -1
- package/dist/core/typedef.d.ts +19 -9
- package/dist/core/typedef.d.ts.map +1 -1
- package/dist/core/typedef.js +26 -20
- package/dist/core/typedef.js.map +1 -1
- package/package.json +3 -3
- package/dist/core/preprocessor.d.ts.map +0 -1
- package/dist/core/preprocessor.js.map +0 -1
- package/dist/core/tokenizer.d.ts +0 -82
- package/dist/core/tokenizer.d.ts.map +0 -1
- package/dist/core/tokenizer.js +0 -277
- package/dist/core/tokenizer.js.map +0 -1
- /package/dist/core/{preprocessor.d.ts → lexer/preprocessor.d.ts} +0 -0
package/dist/api/execution.d.ts
CHANGED
|
@@ -5,5 +5,5 @@ type RunOptions = {
|
|
|
5
5
|
logLevel?: LogLevel;
|
|
6
6
|
};
|
|
7
7
|
declare function execute(sourceCode: string, ioConfig: IOConfig, { useOnebased, logLevel }?: RunOptions): Promise<void>;
|
|
8
|
-
export { execute,
|
|
8
|
+
export { execute, LogLevel, type IOConfig, type RunOptions };
|
|
9
9
|
//# sourceMappingURL=execution.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"execution.d.ts","sourceRoot":"","sources":["../../src/api/execution.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"execution.d.ts","sourceRoot":"","sources":["../../src/api/execution.ts"],"names":[],"mappings":"AAOA,OAAO,EAAmB,KAAK,QAAQ,EAAE,MAAM,mBAAmB,CAAC;AACnE,OAAO,EAAE,QAAQ,EAAe,MAAM,uBAAuB,CAAC;AAE9D,KAAK,UAAU,GAAG;IACjB,WAAW,CAAC,EAAE,OAAO,CAAC;IACtB,QAAQ,CAAC,EAAE,QAAQ,CAAC;CACpB,CAAC;AACF,iBAAe,OAAO,CACrB,UAAU,EAAE,MAAM,EAClB,QAAQ,EAAE,QAAQ,EAClB,EAAE,WAAkB,EAAE,QAAwB,EAAE,GAAE,UAAe,GAC/D,OAAO,CAAC,IAAI,CAAC,CAMf;AAED,OAAO,EAAE,OAAO,EAAE,QAAQ,EAAE,KAAK,QAAQ,EAAE,KAAK,UAAU,EAAE,CAAC"}
|
package/dist/api/execution.js
CHANGED
|
@@ -1,14 +1,14 @@
|
|
|
1
1
|
// src/api/services/execution.ts
|
|
2
2
|
import { createBuiltInFunctions } from '../core/builtIns.js';
|
|
3
|
-
import {
|
|
3
|
+
import { tokenize } from '../core/lexer/tokenizer.js';
|
|
4
|
+
import { parse } from '../core/parser.js';
|
|
4
5
|
import { Environment } from '../core/run/environment.js';
|
|
5
6
|
import { evaluate } from '../core/run/interpreter.js';
|
|
6
7
|
import { createRuntimeIO } from '../core/run/io.js';
|
|
7
8
|
import { setLogLevel } from '../core/run/logger.js';
|
|
8
|
-
import { tokenize } from '../core/tokenizer.js';
|
|
9
9
|
async function execute(sourceCode, ioConfig, { useOnebased = true, logLevel = 2 /* LogLevel.WARN */ } = {}) {
|
|
10
10
|
setLogLevel(logLevel);
|
|
11
|
-
const ast =
|
|
11
|
+
const ast = parse(tokenize(sourceCode, { useOnebased })).program;
|
|
12
12
|
const globalEnv = new Environment();
|
|
13
13
|
const builtIns = createBuiltInFunctions(createRuntimeIO(ioConfig));
|
|
14
14
|
await evaluate(ast, globalEnv, builtIns, {});
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"execution.js","sourceRoot":"","sources":["../../src/api/execution.ts"],"names":[],"mappings":"AAAA,gCAAgC;AAEhC,OAAO,EAAE,sBAAsB,EAAE,MAAM,qBAAqB,CAAC;AAC7D,OAAO,EAAE,MAAM,EAAE,MAAM,mBAAmB,CAAC;
|
|
1
|
+
{"version":3,"file":"execution.js","sourceRoot":"","sources":["../../src/api/execution.ts"],"names":[],"mappings":"AAAA,gCAAgC;AAEhC,OAAO,EAAE,sBAAsB,EAAE,MAAM,qBAAqB,CAAC;AAC7D,OAAO,EAAE,QAAQ,EAAE,MAAM,4BAA4B,CAAC;AACtD,OAAO,EAAE,KAAK,EAAE,MAAM,mBAAmB,CAAC;AAC1C,OAAO,EAAE,WAAW,EAAE,MAAM,4BAA4B,CAAC;AACzD,OAAO,EAAE,QAAQ,EAAE,MAAM,4BAA4B,CAAC;AACtD,OAAO,EAAE,eAAe,EAAiB,MAAM,mBAAmB,CAAC;AACnE,OAAO,EAAY,WAAW,EAAE,MAAM,uBAAuB,CAAC;AAM9D,KAAK,UAAU,OAAO,CACrB,UAAkB,EAClB,QAAkB,EAClB,EAAE,WAAW,GAAG,IAAI,EAAE,QAAQ,wBAAgB,KAAiB,EAAE;IAEjE,WAAW,CAAC,QAAQ,CAAC,CAAC;IACtB,MAAM,GAAG,GAAG,KAAK,CAAC,QAAQ,CAAC,UAAU,EAAE,EAAE,WAAW,EAAE,CAAC,CAAC,CAAC,OAAO,CAAC;IACjE,MAAM,SAAS,GAAG,IAAI,WAAW,EAAE,CAAC;IACpC,MAAM,QAAQ,GAAG,sBAAsB,CAAC,eAAe,CAAC,QAAQ,CAAC,CAAC,CAAC;IACnE,MAAM,QAAQ,CAAC,GAAG,EAAE,SAAS,EAAE,QAAQ,EAAE,EAAE,CAAC,CAAC;AAC9C,CAAC;AAED,OAAO,EAAE,OAAO,EAA4C,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"serviceState.d.ts","sourceRoot":"","sources":["../../src/api/serviceState.ts"],"names":[],"mappings":"AAGA,OAAO,
|
|
1
|
+
{"version":3,"file":"serviceState.d.ts","sourceRoot":"","sources":["../../src/api/serviceState.ts"],"names":[],"mappings":"AAGA,OAAO,EAAoB,KAAK,WAAW,EAAE,MAAM,mBAAmB,CAAC;AACvE,OAAO,EAAkB,KAAK,aAAa,EAAE,MAAM,2BAA2B,CAAC;AAE/E,KAAK,QAAQ,GAAG;IAAE,OAAO,EAAE,MAAM,CAAC;IAAC,OAAO,EAAE,MAAM,MAAM,CAAA;CAAE,CAAC;AAE3D,qBAAa,YAAY;;gBAIZ,WAAW,UAAO;WAIhB,YAAY,CAAC,OAAO,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,GAAG,QAAQ;IAIlE,WAAW,CAAC,GAAG,EAAE,QAAQ,GAAG,YAAY;IAMxC,QAAQ,CAAC,GAAG,EAAE,QAAQ,GAAG,YAAY;IAMrC,cAAc,CAAC,GAAG,EAAE,QAAQ,GAAG,WAAW,GAAG,SAAS;IAItD,gBAAgB,CAAC,GAAG,EAAE,QAAQ,GAAG,aAAa,GAAG,SAAS;CAGjE;AAED,qBAAa,YAAY;;gBAKZ,OAAO,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,EAAE,WAAW,UAAO;IAKnE,IAAI,OAAO,IAAI,MAAM,CAEpB;IAED,IAAI,WAAW,IAAI,WAAW,CAE7B;IAED,IAAI,aAAa,IAAI,aAAa,CAEjC;CACD"}
|
package/dist/api/serviceState.js
CHANGED
|
@@ -1,7 +1,6 @@
|
|
|
1
1
|
// src/api/serviceState.ts
|
|
2
|
-
import {
|
|
3
|
-
import {
|
|
4
|
-
import { tokenize } from '../core/tokenizer.js';
|
|
2
|
+
import { tokenize } from '../core/lexer/tokenizer.js';
|
|
3
|
+
import { parse } from '../core/parser.js';
|
|
5
4
|
import { analyzeSymbols } from './utils/symbolAnalyzer.js';
|
|
6
5
|
export class StateManager {
|
|
7
6
|
#useOnebased;
|
|
@@ -36,8 +35,7 @@ export class ServiceState {
|
|
|
36
35
|
#analyzeResult;
|
|
37
36
|
constructor(version, sourceCode, useOnebased = true) {
|
|
38
37
|
this.#version = version;
|
|
39
|
-
|
|
40
|
-
this.#parseResult = new Parser(tokens, 1 /* ParseMode.TOLERANT */).parse();
|
|
38
|
+
this.#parseResult = parse(tokenize(sourceCode, { useOnebased }), 1 /* ParseMode.TOLERANT */);
|
|
41
39
|
}
|
|
42
40
|
get version() {
|
|
43
41
|
return this.#version;
|
|
@@ -46,8 +44,7 @@ export class ServiceState {
|
|
|
46
44
|
return this.#parseResult;
|
|
47
45
|
}
|
|
48
46
|
get analyzeResult() {
|
|
49
|
-
this.#analyzeResult ??= analyzeSymbols(this.parseResult.program
|
|
50
|
-
return this.#analyzeResult;
|
|
47
|
+
return this.#analyzeResult ??= analyzeSymbols(this.parseResult.program);
|
|
51
48
|
}
|
|
52
49
|
}
|
|
53
50
|
//# sourceMappingURL=serviceState.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"serviceState.js","sourceRoot":"","sources":["../../src/api/serviceState.ts"],"names":[],"mappings":"AAAA,0BAA0B;AAE1B,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"serviceState.js","sourceRoot":"","sources":["../../src/api/serviceState.ts"],"names":[],"mappings":"AAAA,0BAA0B;AAE1B,OAAO,EAAE,QAAQ,EAAE,MAAM,4BAA4B,CAAC;AACtD,OAAO,EAAa,KAAK,EAAoB,MAAM,mBAAmB,CAAC;AACvE,OAAO,EAAE,cAAc,EAAsB,MAAM,2BAA2B,CAAC;AAI/E,MAAM,OAAO,YAAY;IACxB,YAAY,CAAU;IACtB,WAAW,GAAoC,IAAI,OAAO,EAAE,CAAC;IAE7D,YAAY,WAAW,GAAG,IAAI;QAC7B,IAAI,CAAC,YAAY,GAAG,WAAW,CAAC;IACjC,CAAC;IAEM,MAAM,CAAC,YAAY,CAAC,OAAe,EAAE,UAAkB;QAC7D,OAAO,EAAE,OAAO,EAAE,OAAO,EAAE,GAAG,EAAE,CAAC,UAAU,EAAE,CAAC;IAC/C,CAAC;IAEM,WAAW,CAAC,GAAa;QAC/B,MAAM,KAAK,GAAG,IAAI,YAAY,CAAC,GAAG,CAAC,OAAO,EAAE,GAAG,CAAC,OAAO,EAAE,EAAE,IAAI,CAAC,YAAY,CAAC,CAAC;QAC9E,IAAI,CAAC,WAAW,CAAC,GAAG,CAAC,GAAG,EAAE,KAAK,CAAC,CAAC;QACjC,OAAO,KAAK,CAAC;IACd,CAAC;IAEM,QAAQ,CAAC,GAAa;QAC5B,IAAI,KAAK,GAAG,IAAI,CAAC,WAAW,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;QACtC,IAAI,GAAG,CAAC,OAAO,KAAK,KAAK,EAAE,OAAO;YAAE,KAAK,GAAG,IAAI,CAAC,WAAW,CAAC,GAAG,CAAC,CAAC;QAClE,OAAO,KAAK,CAAC;IACd,CAAC;IAEM,cAAc,CAAC,GAAa;QAClC,OAAO,IAAI,CAAC,WAAW,CAAC,GAAG,CAAC,GAAG,CAAC,EAAE,WAAW,CAAC;IAC/C,CAAC;IAEM,gBAAgB,CAAC,GAAa;QACpC,OAAO,IAAI,CAAC,WAAW,CAAC,GAAG,CAAC,GAAG,CAAC,EAAE,aAAa,CAAC;IACjD,CAAC;CACD;AAED,MAAM,OAAO,YAAY;IACxB,QAAQ,CAAS;IACjB,YAAY,CAAc;IAC1B,cAAc,CAAiB;IAE/B,YAAY,OAAe,EAAE,UAAkB,EAAE,WAAW,GAAG,IAAI;QAClE,IAAI,CAAC,QAAQ,GAAG,OAAO,CAAC;QACxB,IAAI,CAAC,YAAY,GAAG,KAAK,CAAC,QAAQ,CAAC,UAAU,EAAE,EAAE,WAAW,EAAE,CAAC,6BAAqB,CAAC;IACtF,CAAC;IAED,IAAI,OAAO;QACV,OAAO,IAAI,CAAC,QAAQ,CAAC;IACtB,CAAC;IAED,IAAI,WAAW;QACd,OAAO,IAAI,CAAC,YAAY,CAAC;IAC1B,CAAC;IAED,IAAI,aAAa;QAChB,OAAO,IAAI,CAAC,cAAc,KAAK,cAAc,CAAC,IAAI,CAAC,WAAW,CAAC,OAAO,CAAC,CAAC;IACzE,CAAC;CACD"}
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
// src/api/services/completions.ts
|
|
2
|
-
import { sortedKeywords } from '../../core/tokenizer.js';
|
|
2
|
+
import { sortedKeywords } from '../../core/lexer/tokenizer.js';
|
|
3
3
|
// 找到指定位置所在的最小作用域
|
|
4
4
|
function findScopeAt({ line: targetLine, character: targetCol }, nodeScopeMap) {
|
|
5
5
|
let bestFitNode;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"completions.js","sourceRoot":"","sources":["../../../src/api/services/completions.ts"],"names":[],"mappings":"AAAA,kCAAkC;AAGlC,OAAO,EAAE,cAAc,EAAE,MAAM,
|
|
1
|
+
{"version":3,"file":"completions.js","sourceRoot":"","sources":["../../../src/api/services/completions.ts"],"names":[],"mappings":"AAAA,kCAAkC;AAGlC,OAAO,EAAE,cAAc,EAAE,MAAM,+BAA+B,CAAC;AAK/D,iBAAiB;AACjB,SAAS,WAAW,CACnB,EAAE,IAAI,EAAE,UAAU,EAAE,SAAS,EAAE,SAAS,EAAY,EACpD,YAAkC;IAElC,IAAI,WAAiC,CAAC;IAEtC,KAAK,MAAM,IAAI,IAAI,YAAY,CAAC,IAAI,EAAE,EAAE,CAAC;QACxC,MAAM,iBAAiB,GACtB,UAAU,GAAG,IAAI,CAAC,IAAI;YACtB,UAAU,GAAG,IAAI,CAAC,OAAO;YACzB,CAAC,UAAU,KAAK,IAAI,CAAC,IAAI,IAAI,SAAS,GAAG,IAAI,CAAC,GAAG,CAAC;YAClD,CAAC,UAAU,KAAK,IAAI,CAAC,OAAO,IAAI,SAAS,GAAG,IAAI,CAAC,MAAM,CAAC;YACxD,CAAC,WAAW;gBACX,CAAC,IAAI,CAAC,IAAI,GAAG,WAAW,CAAC,IAAI;oBAC5B,IAAI,CAAC,OAAO,GAAG,WAAW,CAAC,OAAO;oBAClC,CAAC,IAAI,CAAC,IAAI,KAAK,WAAW,CAAC,IAAI,IAAI,IAAI,CAAC,GAAG,GAAG,WAAW,CAAC,GAAG,CAAC;oBAC9D,CAAC,IAAI,CAAC,OAAO,KAAK,WAAW,CAAC,OAAO,IAAI,IAAI,CAAC,MAAM,GAAG,WAAW,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC;QAChF,IAAI,CAAC,iBAAiB;YAAE,WAAW,GAAG,IAAI,CAAC;IAC5C,CAAC;IACD,OAAO,WAAW,CAAC,CAAC,CAAC,YAAY,CAAC,GAAG,CAAC,WAAW,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC;AAChE,CAAC;AAUD,MAAM,eAAe,GAAG;IACvB,8BAAqB,iCAAyB;IAC9C,8BAAqB,iCAAyB;IAC9C,+BAAsB,mCAA0B;CACM,CAAC;AAExD,oBAAoB;AACpB,SAAS,oBAAoB,CAAC,KAAY;IACzC,MAAM,IAAI,GAAG,IAAI,GAAG,EAAU,CAAC;IAC/B,MAAM,WAAW,GAAiB,EAAE,CAAC;IACrC,KAAK,IAAI,OAAO,GAAsB,KAAK,EAAE,OAAO,EAAE,OAAO,GAAG,OAAO,CAAC,MAAM,EAAE,CAAC;QAChF,OAAO,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC,EAAE,IAAI,EAAE,KAAK,EAAE,IAAI,EAAE,EAAE,EAAE;YACjD,MAAM,GAAG,GAAG,GAAG,KAAK,KAAK,IAAI,EAAE,CAAC;YAChC,IAAI,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC;gBAAE,OAAO;YAC1B,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;YACd,WAAW,CAAC,IAAI,CAAC,EAAE,KAAK,EAAE,IAAI,EAAE,eAAe,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;QAC1D,CAAC,CAAC,CAAC;IACJ,CAAC;IACD,OAAO,WAAW,CAAC;AACpB,CAAC;AAED,MAAM,UAAU,cAAc,CAAC,YAA0B,EAAE,QAAkB;IAC5E,MAAM,EAAE,SAAS,EAAE,YAAY,EAAE,GAAG,YAAY,CAAC,aAAa,CAAC;IAC/D,MAAM,YAAY,GAAG,WAAW,CAAC,QAAQ,EAAE,YAAY,CAAC,IAAI,SAAS,CAAC;IAEtE,MAAM,iBAAiB,GAAG,oBAAoB,CAAC,YAAY,CAAC,CAAC;IAC7D,MAAM,kBAAkB,GAAG,cAAc,CAAC,GAAG,CAAa,KAAK,CAAC,EAAE,CAAC,CAAC,EAAE,KAAK,EAAE,IAAI,iCAAwB,EAAE,CAAC,CAAC,CAAC;IAE9G,OAAO,CAAC,GAAG,iBAAiB,EAAE,GAAG,kBAAkB,CAAC,OAAO,EAAE,CAAC,CAAC;AAChE,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"formatting.d.ts","sourceRoot":"","sources":["../../../src/api/services/formatting.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"formatting.d.ts","sourceRoot":"","sources":["../../../src/api/services/formatting.ts"],"names":[],"mappings":"AAyNA,wBAAgB,gBAAgB,CAAC,UAAU,EAAE,MAAM,GAAG,MAAM,CAI3D"}
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
// src/api/services/formatting.ts
|
|
2
|
-
import {
|
|
3
|
-
import {
|
|
2
|
+
import { isKeyword, tokenize } from '../../core/lexer/tokenizer.js';
|
|
3
|
+
import { parse } from '../../core/parser.js';
|
|
4
4
|
function indent(options) {
|
|
5
5
|
return options.indentChar.repeat(options.level);
|
|
6
6
|
}
|
|
@@ -42,9 +42,8 @@ function printNodeContent(node, options) {
|
|
|
42
42
|
const gap = nextStmt.line - stmt.endLine - 1;
|
|
43
43
|
const commentCount = nextStmt.leadingComments?.length ?? 0;
|
|
44
44
|
const hasFunction = stmt.kind === 4 /* NodeKind.FunctionDeclaration */ || nextStmt.kind === 4 /* NodeKind.FunctionDeclaration */;
|
|
45
|
-
|
|
46
|
-
|
|
47
|
-
parts.push(...Array(eL).fill(''));
|
|
45
|
+
for (let eL = Math.max(gap - commentCount, +hasFunction); eL-- > 0; parts.push(''))
|
|
46
|
+
;
|
|
48
47
|
}
|
|
49
48
|
return parts.join('\n');
|
|
50
49
|
}
|
|
@@ -76,22 +75,19 @@ function printNodeContent(node, options) {
|
|
|
76
75
|
}
|
|
77
76
|
case 2 /* NodeKind.VariableDeclaration */: {
|
|
78
77
|
const { initialization, identifier } = node;
|
|
79
|
-
|
|
80
|
-
|
|
81
|
-
|
|
82
|
-
}
|
|
83
|
-
else {
|
|
84
|
-
content = `${indent(options)}蹭 ${printIdentifier(identifier)}`;
|
|
85
|
-
}
|
|
78
|
+
const printedContent = initialization
|
|
79
|
+
? printNodeContent(initialization, { ...options, level: 0 }).trim()
|
|
80
|
+
: printIdentifier(identifier);
|
|
81
|
+
content = `${indent(options)}蹭 ${printedContent}`;
|
|
86
82
|
break;
|
|
87
83
|
}
|
|
88
84
|
case 3 /* NodeKind.AssignmentStatement */: {
|
|
89
85
|
const { operator, assignee, value } = node;
|
|
90
|
-
const o = operator ===
|
|
86
|
+
const o = operator === 4 /* TokenKind.ASSIGNMENT_ONLY */ ? '才是' : operator === 3 /* TokenKind.ASSIGNMENT_LIKE */ ? '就像' : '就是';
|
|
91
87
|
content = `${indent(options)}${printNodeContent(assignee, options)} ${o} ${printNodeContent(value, options)}`;
|
|
92
88
|
break;
|
|
93
89
|
}
|
|
94
|
-
case
|
|
90
|
+
case 17 /* NodeKind.CallExpression */: {
|
|
95
91
|
const { args, callee } = node;
|
|
96
92
|
const argsExpr = printNodeContent(args, { ...options, level: 0 });
|
|
97
93
|
const p = options.level > 0 ? indent(options) : '';
|
|
@@ -130,21 +126,21 @@ function printNodeContent(node, options) {
|
|
|
130
126
|
content = `${indent(options)}累了`;
|
|
131
127
|
break;
|
|
132
128
|
}
|
|
133
|
-
case
|
|
129
|
+
case 18 /* NodeKind.MemberAccessExpression */: {
|
|
134
130
|
const { object, property } = node;
|
|
135
131
|
// 打印 a@b
|
|
136
132
|
content = `${printNodeContent(object, options)}@${printNodeContent(property, options)}`;
|
|
137
133
|
break;
|
|
138
134
|
}
|
|
139
|
-
case
|
|
135
|
+
case 19 /* NodeKind.UnaryExpression */: {
|
|
140
136
|
const { operator, argument } = node;
|
|
141
|
-
const op = operator ===
|
|
137
|
+
const op = operator === 3 /* TokenKind.ASSIGNMENT_LIKE */ ? '高仿' : '抢走';
|
|
142
138
|
content = `${op} ${printNodeContent(argument, options)}`;
|
|
143
139
|
break;
|
|
144
140
|
}
|
|
145
|
-
case
|
|
141
|
+
case 20 /* NodeKind.ArithmeticExpression */: {
|
|
146
142
|
const { left, operator, right } = node;
|
|
147
|
-
content = `${printNodeContent(left, options)} ${operator} ${printNodeContent(right, options)}`;
|
|
143
|
+
content = `${printNodeContent(left, options)} ${operator.value} ${printNodeContent(right, options)}`;
|
|
148
144
|
break;
|
|
149
145
|
}
|
|
150
146
|
case 21 /* NodeKind.ComparisonExpression */: {
|
|
@@ -158,24 +154,18 @@ function printNodeContent(node, options) {
|
|
|
158
154
|
content = parts.join(' ');
|
|
159
155
|
break;
|
|
160
156
|
}
|
|
161
|
-
case
|
|
157
|
+
case 23 /* NodeKind.LogicalExpression */: {
|
|
162
158
|
const { left, operator, right } = node;
|
|
163
|
-
const o = {
|
|
164
|
-
[
|
|
165
|
-
[
|
|
166
|
-
[
|
|
167
|
-
[
|
|
168
|
-
};
|
|
169
|
-
|
|
170
|
-
|
|
171
|
-
|
|
172
|
-
|
|
173
|
-
[2 /* LogicalOperator.NAND */]: '不好',
|
|
174
|
-
};
|
|
175
|
-
content = `${printNodeContent(left, options)} ${o[operator]} ${printNodeContent(right, options)} ${c[operator]}`;
|
|
176
|
-
break;
|
|
177
|
-
}
|
|
178
|
-
case 19 /* NodeKind.SequenceExpression */: {
|
|
159
|
+
const [o, c] = {
|
|
160
|
+
[39 /* TokenKind.LOGIC_CLOSE_AND */]: ['和', '都好'],
|
|
161
|
+
[40 /* TokenKind.LOGIC_CLOSE_OR */]: ['或', '不坏'],
|
|
162
|
+
[41 /* TokenKind.LOGIC_CLOSE_NOR */]: ['和', '都坏'],
|
|
163
|
+
[42 /* TokenKind.LOGIC_CLOSE_NAND */]: ['或', '不好'],
|
|
164
|
+
}[operator];
|
|
165
|
+
content = `${printNodeContent(left, options)} ${o} ${printNodeContent(right, options)} ${c}`;
|
|
166
|
+
break;
|
|
167
|
+
}
|
|
168
|
+
case 22 /* NodeKind.SequenceExpression */: {
|
|
179
169
|
const { sections, operators } = node;
|
|
180
170
|
let s = printNodeContent(sections[0], options);
|
|
181
171
|
for (let i = 0; i < operators.length; i++) {
|
|
@@ -215,8 +205,7 @@ function printNodeContent(node, options) {
|
|
|
215
205
|
return leading + content;
|
|
216
206
|
}
|
|
217
207
|
export function getFormattedCode(sourceCode) {
|
|
218
|
-
const
|
|
219
|
-
const ast = parser.parse().program;
|
|
208
|
+
const ast = parse(tokenize(sourceCode, { ignoreComments: false }), 1 /* ParseMode.TOLERANT */).program;
|
|
220
209
|
const options = { indentChar: '\t', level: 0 };
|
|
221
210
|
return printNodeContent(ast, options);
|
|
222
211
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"formatting.js","sourceRoot":"","sources":["../../../src/api/services/formatting.ts"],"names":[],"mappings":"AAAA,iCAAiC;AAIjC,OAAO,
|
|
1
|
+
{"version":3,"file":"formatting.js","sourceRoot":"","sources":["../../../src/api/services/formatting.ts"],"names":[],"mappings":"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"}
|
|
@@ -7,13 +7,13 @@ declare const enum InlayHintKind {
|
|
|
7
7
|
/**
|
|
8
8
|
* 内联提示信息结构
|
|
9
9
|
*/
|
|
10
|
-
export
|
|
10
|
+
export type InlayHint = {
|
|
11
11
|
position: Position;
|
|
12
12
|
label: string;
|
|
13
13
|
kind: InlayHintKind;
|
|
14
14
|
paddingLeft?: boolean;
|
|
15
15
|
paddingRight?: boolean;
|
|
16
|
-
}
|
|
16
|
+
};
|
|
17
17
|
/**
|
|
18
18
|
* 主函数：获取源代码的内联提示
|
|
19
19
|
*/
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"inlayHints.d.ts","sourceRoot":"","sources":["../../../src/api/services/inlayHints.ts"],"names":[],"mappings":"AAKA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,oBAAoB,CAAC;AAEvD,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,sBAAsB,CAAC;AAGrD,mBAAW,aAAa;IACvB,IAAI,IAAI;IACR,SAAS,IAAI;CACb;AAED;;GAEG;AACH,MAAM,
|
|
1
|
+
{"version":3,"file":"inlayHints.d.ts","sourceRoot":"","sources":["../../../src/api/services/inlayHints.ts"],"names":[],"mappings":"AAKA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,oBAAoB,CAAC;AAEvD,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,sBAAsB,CAAC;AAGrD,mBAAW,aAAa;IACvB,IAAI,IAAI;IACR,SAAS,IAAI;CACb;AAED;;GAEG;AACH,MAAM,MAAM,SAAS,GAAG;IACvB,QAAQ,EAAE,QAAQ,CAAC;IACnB,KAAK,EAAE,MAAM,CAAC;IACd,IAAI,EAAE,aAAa,CAAC;IACpB,WAAW,CAAC,EAAE,OAAO,CAAC;IACtB,YAAY,CAAC,EAAE,OAAO,CAAC;CACvB,CAAC;AAgCF;;GAEG;AACH,wBAAgB,aAAa,CAAC,YAAY,EAAE,YAAY,GAAG,SAAS,EAAE,CAsErE"}
|
|
@@ -25,7 +25,7 @@ function extractParamNames(paramsBlock) {
|
|
|
25
25
|
if (expr.kind === 13 /* NodeKind.Identifier */) {
|
|
26
26
|
names.push(expr.symbol);
|
|
27
27
|
}
|
|
28
|
-
else if (expr.kind ===
|
|
28
|
+
else if (expr.kind === 19 /* NodeKind.UnaryExpression */ && expr.argument.kind === 13 /* NodeKind.Identifier */) {
|
|
29
29
|
names.push(expr.argument.symbol);
|
|
30
30
|
}
|
|
31
31
|
// 其他类型的表达式作为参数时没有名字
|
|
@@ -64,7 +64,7 @@ export function getInlayHints(serviceState) {
|
|
|
64
64
|
});
|
|
65
65
|
// 生成函数参数名提示
|
|
66
66
|
function walk(node) {
|
|
67
|
-
makeHint: if (node.kind ===
|
|
67
|
+
makeHint: if (node.kind === 17 /* NodeKind.CallExpression */ &&
|
|
68
68
|
node.args.kind === 14 /* NodeKind.BlockExpression */ &&
|
|
69
69
|
node.args.isCollection) {
|
|
70
70
|
const calleeInfo = symbolMap.get(node.callee);
|
|
@@ -36,26 +36,26 @@ export function forEachChild(node, action) {
|
|
|
36
36
|
case 16 /* NodeKind.LoopExpression */:
|
|
37
37
|
action(node.body);
|
|
38
38
|
break;
|
|
39
|
-
case
|
|
39
|
+
case 17 /* NodeKind.CallExpression */:
|
|
40
40
|
action(node.callee);
|
|
41
41
|
action(node.args);
|
|
42
42
|
break;
|
|
43
|
-
case
|
|
43
|
+
case 18 /* NodeKind.MemberAccessExpression */:
|
|
44
44
|
action(node.object);
|
|
45
45
|
action(node.property);
|
|
46
46
|
break;
|
|
47
|
-
case
|
|
47
|
+
case 19 /* NodeKind.UnaryExpression */:
|
|
48
48
|
action(node.argument);
|
|
49
49
|
break;
|
|
50
|
-
case
|
|
51
|
-
case
|
|
50
|
+
case 20 /* NodeKind.ArithmeticExpression */:
|
|
51
|
+
case 23 /* NodeKind.LogicalExpression */:
|
|
52
52
|
action(node.left);
|
|
53
53
|
action(node.right);
|
|
54
54
|
break;
|
|
55
55
|
case 21 /* NodeKind.ComparisonExpression */:
|
|
56
56
|
node.expressions.forEach(action);
|
|
57
57
|
break;
|
|
58
|
-
case
|
|
58
|
+
case 22 /* NodeKind.SequenceExpression */:
|
|
59
59
|
node.sections.forEach(action);
|
|
60
60
|
break;
|
|
61
61
|
case 7 /* NodeKind.BreakStatement */:
|
|
@@ -1,5 +1,4 @@
|
|
|
1
1
|
import type * as AST from '../../core/ast.js';
|
|
2
|
-
import type { MeaoiuBuiltInNames } from '../../core/builtIns.js';
|
|
3
2
|
import { type MeaoiuError } from '../../core/error.js';
|
|
4
3
|
import { type Scope, type SymbolInfo } from './symbolTable.js';
|
|
5
4
|
declare class SymbolAnalyzer {
|
|
@@ -32,6 +31,6 @@ export type AnalyzeResult = {
|
|
|
32
31
|
symbolMap: SymbolAnalyzer['symbolMap'];
|
|
33
32
|
nodeScopeMap: SymbolAnalyzer['nodeScopeMap'];
|
|
34
33
|
};
|
|
35
|
-
export declare function analyzeSymbols(ast: AST.Program
|
|
34
|
+
export declare function analyzeSymbols(ast: AST.Program): AnalyzeResult;
|
|
36
35
|
export {};
|
|
37
36
|
//# sourceMappingURL=symbolAnalyzer.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"symbolAnalyzer.d.ts","sourceRoot":"","sources":["../../../src/api/utils/symbolAnalyzer.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,KAAK,GAAG,MAAM,mBAAmB,CAAC;
|
|
1
|
+
{"version":3,"file":"symbolAnalyzer.d.ts","sourceRoot":"","sources":["../../../src/api/utils/symbolAnalyzer.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,KAAK,GAAG,MAAM,mBAAmB,CAAC;AAG9C,OAAO,EAAoB,KAAK,WAAW,EAAE,MAAM,qBAAqB,CAAC;AAGzE,OAAO,EAAyB,KAAK,KAAK,EAAE,KAAK,UAAU,EAAE,MAAM,kBAAkB,CAAC;AAItF,cAAM,cAAc;IACnB,SAAgB,MAAM,EAAE,WAAW,EAAE,CAAM;IAC3C,SAAgB,SAAS,EAAE,GAAG,CAAC,GAAG,CAAC,IAAI,EAAE,UAAU,CAAC,CAAa;IACjE,SAAgB,YAAY,EAAE,GAAG,CAAC,GAAG,CAAC,IAAI,EAAE,KAAK,CAAC,CAAa;IAC/D,OAAO,CAAC,YAAY,CAAQ;gBAEhB,SAAS,EAAE,KAAK;IAI5B,OAAO,CAAC,mBAAmB;IAqEpB,KAAK,CAAC,IAAI,EAAE,GAAG,CAAC,IAAI,GAAG,SAAS,GAAG,IAAI;IA6E9C,OAAO,CAAC,wBAAwB;IAoChC,OAAO,CAAC,wBAAwB;IAyBhC,OAAO,CAAC,wBAAwB;IAiChC,OAAO,CAAC,yBAAyB;IAyBjC,OAAO,CAAC,yBAAyB;IA+BjC,OAAO,CAAC,uBAAuB;IAwC/B,OAAO,CAAC,uBAAuB;IAoB/B,OAAO,CAAC,sBAAsB;IAK9B,OAAO,CAAC,eAAe;IAavB,OAAO,CAAC,WAAW;IAWnB,OAAO,CAAC,UAAU;IAMlB,OAAO,CAAC,UAAU;IAIlB,OAAO,CAAC,eAAe;IAOvB,OAAO,CAAC,OAAO;IA4Bf,OAAO,CAAC,MAAM;CA8Bd;AAED,MAAM,MAAM,aAAa,GAAG;IAC3B,SAAS,EAAE,KAAK,CAAC;IACjB,MAAM,EAAE,WAAW,EAAE,CAAC;IACtB,SAAS,EAAE,cAAc,CAAC,WAAW,CAAC,CAAC;IACvC,YAAY,EAAE,cAAc,CAAC,cAAc,CAAC,CAAC;CAC7C,CAAC;AAEF,wBAAgB,cAAc,CAAC,GAAG,EAAE,GAAG,CAAC,OAAO,GAAG,aAAa,CAkB9D"}
|