@aster-cloud/aster-lang-ts 0.0.32 → 0.1.1
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/CHANGELOG.md +46 -0
- package/README.md +4 -4
- package/dist/peg/headers-parser.js +233 -468
- package/dist/scripts/aster.js +5 -5
- package/dist/scripts/aster.js.map +1 -1
- package/dist/scripts/cleanup-examples.js +1 -1
- package/dist/scripts/cleanup-examples.js.map +1 -1
- package/dist/scripts/emit-classfiles.js +1 -50
- package/dist/scripts/emit-classfiles.js.map +1 -1
- package/dist/scripts/emit-core.js +1 -1
- package/dist/scripts/emit-core.js.map +1 -1
- package/dist/scripts/golden.js +5 -8
- package/dist/scripts/golden.js.map +1 -1
- package/dist/scripts/lsp-build-index.js +1 -1
- package/dist/scripts/lsp-build-index.js.map +1 -1
- package/dist/scripts/lsp-capmanifest-codeaction-smoke.js +2 -2
- package/dist/scripts/lsp-capmanifest-codeaction-smoke.js.map +1 -1
- package/dist/scripts/lsp-codeaction-smoke.js +2 -2
- package/dist/scripts/lsp-codeaction-smoke.js.map +1 -1
- package/dist/scripts/lsp-health-smoke.js +1 -1
- package/dist/scripts/lsp-health-smoke.js.map +1 -1
- package/dist/scripts/lsp-missing-header-codeaction-smoke.js +1 -1
- package/dist/scripts/lsp-missing-header-codeaction-smoke.js.map +1 -1
- package/dist/scripts/lsp-multi-rename.test.js +1 -1
- package/dist/scripts/lsp-multi-rename.test.js.map +1 -1
- package/dist/scripts/lsp-punct-codeaction-smoke.js +1 -1
- package/dist/scripts/lsp-punct-codeaction-smoke.js.map +1 -1
- package/dist/scripts/lsp-streaming-progress-smoke.js +2 -2
- package/dist/scripts/lsp-streaming-progress-smoke.js.map +1 -1
- package/dist/scripts/perf-benchmark.js +1 -1
- package/dist/scripts/perf-benchmark.js.map +1 -1
- package/dist/scripts/perf-diagnostics.js +1 -1
- package/dist/scripts/perf-diagnostics.js.map +1 -1
- package/dist/scripts/profile-medium-project.js +1 -1
- package/dist/scripts/profile-medium-project.js.map +1 -1
- package/dist/scripts/repl.js +1 -1
- package/dist/scripts/repl.js.map +1 -1
- package/dist/scripts/typecheck-cli.js +1 -1
- package/dist/scripts/typecheck-cli.js.map +1 -1
- package/dist/scripts/update-eff-violation-expected.js +1 -1
- package/dist/scripts/update-eff-violation-expected.js.map +1 -1
- package/dist/scripts/verify-capabilities.js +1 -1
- package/dist/scripts/verify-capabilities.js.map +1 -1
- package/dist/src/ai/validator.d.ts.map +1 -1
- package/dist/src/ai/validator.js +13 -1
- package/dist/src/ai/validator.js.map +1 -1
- package/dist/src/ast/ast.js +1 -1
- package/dist/src/ast/ast.js.map +1 -1
- package/dist/src/browser.d.ts +10 -18
- package/dist/src/browser.d.ts.map +1 -1
- package/dist/src/browser.js +36 -33
- package/dist/src/browser.js.map +1 -1
- package/dist/src/cli/policy-converter.js +1 -1
- package/dist/src/cli/policy-converter.js.map +1 -1
- package/dist/src/config/lexicons/diagnostic-messages.d.ts +23 -0
- package/dist/src/config/lexicons/diagnostic-messages.d.ts.map +1 -0
- package/dist/src/config/lexicons/diagnostic-messages.js +130 -0
- package/dist/src/config/lexicons/diagnostic-messages.js.map +1 -0
- package/dist/src/config/lexicons/input-generation-rules.d.ts +22 -0
- package/dist/src/config/lexicons/input-generation-rules.d.ts.map +1 -0
- package/dist/src/config/lexicons/input-generation-rules.js +142 -0
- package/dist/src/config/lexicons/input-generation-rules.js.map +1 -0
- package/dist/src/config/lexicons/lsp-ui-texts.d.ts +42 -0
- package/dist/src/config/lexicons/lsp-ui-texts.d.ts.map +1 -0
- package/dist/src/config/lexicons/lsp-ui-texts.js +75 -0
- package/dist/src/config/lexicons/lsp-ui-texts.js.map +1 -0
- package/dist/src/config/lexicons/overlay-loader.d.ts +55 -0
- package/dist/src/config/lexicons/overlay-loader.d.ts.map +1 -0
- package/dist/src/config/lexicons/overlay-loader.js +30 -0
- package/dist/src/config/lexicons/overlay-loader.js.map +1 -0
- package/dist/src/config/lexicons/type-inference-rules.d.ts +19 -0
- package/dist/src/config/lexicons/type-inference-rules.d.ts.map +1 -0
- package/dist/src/config/lexicons/type-inference-rules.js +56 -0
- package/dist/src/config/lexicons/type-inference-rules.js.map +1 -0
- package/dist/src/config/lexicons/types.d.ts +10 -0
- package/dist/src/config/lexicons/types.d.ts.map +1 -1
- package/dist/src/config/lexicons/types.js.map +1 -1
- package/dist/src/config/semantic.d.ts +0 -8
- package/dist/src/config/semantic.d.ts.map +1 -1
- package/dist/src/config/semantic.js +0 -16
- package/dist/src/config/semantic.js.map +1 -1
- package/dist/src/core/index.d.ts +2 -0
- package/dist/src/core/index.d.ts.map +1 -1
- package/dist/src/core/index.js +1 -0
- package/dist/src/core/index.js.map +1 -1
- package/dist/src/core/interpreter.d.ts +37 -0
- package/dist/src/core/interpreter.d.ts.map +1 -0
- package/dist/src/core/interpreter.js +454 -0
- package/dist/src/core/interpreter.js.map +1 -0
- package/dist/src/diagnostics/diagnostics.d.ts +6 -7
- package/dist/src/diagnostics/diagnostics.d.ts.map +1 -1
- package/dist/src/diagnostics/diagnostics.js +15 -9
- package/dist/src/diagnostics/diagnostics.js.map +1 -1
- package/dist/src/diagnostics/error_codes.d.ts +2 -1
- package/dist/src/diagnostics/error_codes.d.ts.map +1 -1
- package/dist/src/diagnostics/error_codes.js +85 -480
- package/dist/src/diagnostics/error_codes.js.map +1 -1
- package/dist/src/formatter.js +9 -24
- package/dist/src/formatter.js.map +1 -1
- package/dist/src/frontend/lexer.d.ts +1 -1
- package/dist/src/frontend/lexer.js +1 -1
- package/dist/src/index.d.ts +4 -3
- package/dist/src/index.d.ts.map +1 -1
- package/dist/src/index.js +3 -3
- package/dist/src/index.js.map +1 -1
- package/dist/src/jvm/emitter.js +3 -3
- package/dist/src/jvm/emitter.js.map +1 -1
- package/dist/src/lower_to_core.d.ts +3 -3
- package/dist/src/lower_to_core.js +3 -3
- package/dist/src/lsp/codeaction.d.ts +2 -1
- package/dist/src/lsp/codeaction.d.ts.map +1 -1
- package/dist/src/lsp/codeaction.js +17 -14
- package/dist/src/lsp/codeaction.js.map +1 -1
- package/dist/src/lsp/completion.d.ts +4 -51
- package/dist/src/lsp/completion.d.ts.map +1 -1
- package/dist/src/lsp/completion.js +16 -84
- package/dist/src/lsp/completion.js.map +1 -1
- package/dist/src/lsp/diagnostics.d.ts +3 -2
- package/dist/src/lsp/diagnostics.d.ts.map +1 -1
- package/dist/src/lsp/diagnostics.js +14 -7
- package/dist/src/lsp/diagnostics.js.map +1 -1
- package/dist/src/lsp/navigation/definition.js +1 -1
- package/dist/src/lsp/navigation/definition.js.map +1 -1
- package/dist/src/lsp/navigation/document-symbol.js +1 -1
- package/dist/src/lsp/navigation/document-symbol.js.map +1 -1
- package/dist/src/lsp/navigation/hover.d.ts +2 -1
- package/dist/src/lsp/navigation/hover.d.ts.map +1 -1
- package/dist/src/lsp/navigation/hover.js +23 -36
- package/dist/src/lsp/navigation/hover.js.map +1 -1
- package/dist/src/lsp/navigation.d.ts +1 -1
- package/dist/src/lsp/navigation.d.ts.map +1 -1
- package/dist/src/lsp/navigation.js +2 -2
- package/dist/src/lsp/navigation.js.map +1 -1
- package/dist/src/lsp/pii_diagnostics.js +3 -13
- package/dist/src/lsp/pii_diagnostics.js.map +1 -1
- package/dist/src/lsp/server.js +35 -8
- package/dist/src/lsp/server.js.map +1 -1
- package/dist/src/lsp/tokens.js +2 -2
- package/dist/src/lsp/tokens.js.map +1 -1
- package/dist/src/lsp/workspace/document-indexer.js +2 -2
- package/dist/src/lsp/workspace/document-indexer.js.map +1 -1
- package/dist/src/package/resolver.js +6 -6
- package/dist/src/package/resolver.js.map +1 -1
- package/dist/src/parser/constraint-parser.d.ts +1 -10
- package/dist/src/parser/constraint-parser.d.ts.map +1 -1
- package/dist/src/parser/constraint-parser.js +0 -30
- package/dist/src/parser/constraint-parser.js.map +1 -1
- package/dist/src/parser/context.d.ts +3 -1
- package/dist/src/parser/context.d.ts.map +1 -1
- package/dist/src/parser/context.js +2 -1
- package/dist/src/parser/context.js.map +1 -1
- package/dist/src/parser/decl-parser.d.ts +6 -10
- package/dist/src/parser/decl-parser.d.ts.map +1 -1
- package/dist/src/parser/decl-parser.js +86 -58
- package/dist/src/parser/decl-parser.js.map +1 -1
- package/dist/src/parser/expr-stmt-parser.js +3 -3
- package/dist/src/parser/expr-stmt-parser.js.map +1 -1
- package/dist/src/parser/field-variant-parser.js +1 -1
- package/dist/src/parser/field-variant-parser.js.map +1 -1
- package/dist/src/parser/import-parser.d.ts +1 -1
- package/dist/src/parser/import-parser.js +2 -2
- package/dist/src/parser/import-parser.js.map +1 -1
- package/dist/src/parser/input-generator.d.ts +20 -6
- package/dist/src/parser/input-generator.d.ts.map +1 -1
- package/dist/src/parser/input-generator.js +20 -403
- package/dist/src/parser/input-generator.js.map +1 -1
- package/dist/src/parser/type-inference.d.ts +10 -16
- package/dist/src/parser/type-inference.d.ts.map +1 -1
- package/dist/src/parser/type-inference.js +36 -127
- package/dist/src/parser/type-inference.js.map +1 -1
- package/dist/src/parser.d.ts +18 -5
- package/dist/src/parser.d.ts.map +1 -1
- package/dist/src/parser.js +11 -8
- package/dist/src/parser.js.map +1 -1
- package/dist/src/typecheck/context.d.ts +2 -0
- package/dist/src/typecheck/context.d.ts.map +1 -1
- package/dist/src/typecheck/context.js.map +1 -1
- package/dist/src/typecheck/diagnostics.d.ts +6 -0
- package/dist/src/typecheck/diagnostics.d.ts.map +1 -1
- package/dist/src/typecheck/diagnostics.js +11 -3
- package/dist/src/typecheck/diagnostics.js.map +1 -1
- package/dist/src/typecheck/module.d.ts.map +1 -1
- package/dist/src/typecheck/module.js +8 -2
- package/dist/src/typecheck/module.js.map +1 -1
- package/dist/src/typecheck/workflow.js +10 -10
- package/dist/src/typecheck/workflow.js.map +1 -1
- package/dist/src/types/type-inference.d.ts +20 -0
- package/dist/src/types/type-inference.d.ts.map +1 -0
- package/dist/src/types/type-inference.js +8 -0
- package/dist/src/types/type-inference.js.map +1 -0
- package/dist/src/types.d.ts +0 -21
- package/dist/src/types.d.ts.map +1 -1
- package/dist/src/types.js.map +1 -1
- package/dist/test/benchmark.js +8 -8
- package/dist/test/benchmark.js.map +1 -1
- package/dist/test/compiler/depends-on.test.js +1 -1
- package/dist/test/compiler/depends-on.test.js.map +1 -1
- package/dist/test/compiler/workflow-emitter-helpers.js +1 -1
- package/dist/test/compiler/workflow-emitter-helpers.js.map +1 -1
- package/dist/test/e2e/runner/golden-runner.js +3 -3
- package/dist/test/e2e/runner/golden-runner.js.map +1 -1
- package/dist/test/fuzz/formatter-fuzz.test.js +5 -1
- package/dist/test/fuzz/formatter-fuzz.test.js.map +1 -1
- package/dist/test/integration/compliance/compliance-smoke.test.js +4 -1
- package/dist/test/integration/compliance/compliance-smoke.test.js.map +1 -1
- package/dist/test/integration/lsp/lsp-completion.test.js +1 -1
- package/dist/test/integration/lsp/lsp-completion.test.js.map +1 -1
- package/dist/test/integration/lsp/lsp-diagnostics.test.js +1 -1
- package/dist/test/integration/lsp/lsp-diagnostics.test.js.map +1 -1
- package/dist/test/integration/lsp/lsp-modules.test.js +1 -1
- package/dist/test/integration/lsp/lsp-modules.test.js.map +1 -1
- package/dist/test/integration/lsp/lsp-navigation.test.js +1 -1
- package/dist/test/integration/lsp/lsp-navigation.test.js.map +1 -1
- package/dist/test/integration/pipeline/pipeline.test.js +4 -4
- package/dist/test/integration/pipeline/pipeline.test.js.map +1 -1
- package/dist/test/property/lsp-props.test.js +2 -2
- package/dist/test/property/lsp-props.test.js.map +1 -1
- package/dist/test/property/property.test.js +15 -15
- package/dist/test/property/property.test.js.map +1 -1
- package/dist/test/regression/type-checker-golden.test.js +1 -1
- package/dist/test/regression/type-checker-golden.test.js.map +1 -1
- package/dist/test/type-checker/cross-module-packages.test.js +1 -1
- package/dist/test/type-checker/cross-module-packages.test.js.map +1 -1
- package/dist/test/type-checker/pii-propagation.test.js +1 -2
- package/dist/test/type-checker/pii-propagation.test.js.map +1 -1
- package/dist/test/unit/async/async-discipline.test.js +1 -1
- package/dist/test/unit/async/async-discipline.test.js.map +1 -1
- package/dist/test/unit/async/async-schedule.test.js +1 -1
- package/dist/test/unit/async/async-schedule.test.js.map +1 -1
- package/dist/test/unit/browser/extract-schema.test.d.ts +2 -0
- package/dist/test/unit/browser/extract-schema.test.d.ts.map +1 -0
- package/dist/test/unit/browser/extract-schema.test.js +117 -0
- package/dist/test/unit/browser/extract-schema.test.js.map +1 -0
- package/dist/test/unit/emitter/emitter.test.js +30 -35
- package/dist/test/unit/emitter/emitter.test.js.map +1 -1
- package/dist/test/unit/interpreter/interpreter.test.d.ts +2 -0
- package/dist/test/unit/interpreter/interpreter.test.d.ts.map +1 -0
- package/dist/test/unit/interpreter/interpreter.test.js +507 -0
- package/dist/test/unit/interpreter/interpreter.test.js.map +1 -0
- package/dist/test/unit/keyword-translator.test.js +4 -4
- package/dist/test/unit/keyword-translator.test.js.map +1 -1
- package/dist/test/unit/lowering/lowering.test.js +2 -2
- package/dist/test/unit/lowering/lowering.test.js.map +1 -1
- package/dist/test/unit/lsp/pii-diagnostics.test.js +5 -5
- package/dist/test/unit/lsp/pii-diagnostics.test.js.map +1 -1
- package/dist/test/unit/parser/parser.test.js +39 -37
- package/dist/test/unit/parser/parser.test.js.map +1 -1
- package/dist/test/unit/parser/type-inference.test.js +50 -32
- package/dist/test/unit/parser/type-inference.test.js.map +1 -1
- package/dist/test/unit/typecheck/async-discipline-extended.test.js +1 -1
- package/dist/test/unit/typecheck/async-discipline-extended.test.js.map +1 -1
- package/dist/test/unit/typecheck/effects-and-capabilities.test.js +4 -4
- package/dist/test/unit/typecheck/effects-and-capabilities.test.js.map +1 -1
- package/dist/test/unit/typecheck/regression-fixes.test.js +12 -12
- package/dist/test/unit/typecheck/regression-fixes.test.js.map +1 -1
- package/dist/test/unit/typecheck/type-inference.test.js +1 -1
- package/dist/test/unit/typecheck/type-inference.test.js.map +1 -1
- package/dist/test/unit/typecheck/type-system.test.js +2 -2
- package/dist/test/unit/typecheck/type-system.test.js.map +1 -1
- package/dist/test/unit/typecheck/typecheck-advanced.test.js +3 -3
- package/dist/test/unit/typecheck/typecheck-advanced.test.js.map +1 -1
- package/package.json +6 -3
|
@@ -8,6 +8,7 @@ import { loadCapabilityManifest } from './diagnostics.js';
|
|
|
8
8
|
import { ConfigService } from '../config/config-service.js';
|
|
9
9
|
import path from 'node:path';
|
|
10
10
|
import { pathToFileURL } from 'node:url';
|
|
11
|
+
import { getLspUiTexts } from '../config/lexicons/lsp-ui-texts.js';
|
|
11
12
|
/**
|
|
12
13
|
* 注册 CodeAction 相关的 LSP 处理器
|
|
13
14
|
* @param connection LSP 连接对象
|
|
@@ -15,7 +16,7 @@ import { pathToFileURL } from 'node:url';
|
|
|
15
16
|
* @param getOrParse 文档解析函数,返回文本、词法标记和 AST
|
|
16
17
|
* @param uriToFsPath URI 转文件系统路径函数
|
|
17
18
|
*/
|
|
18
|
-
export function registerCodeActionHandlers(connection, documents, getOrParse, uriToFsPath) {
|
|
19
|
+
export function registerCodeActionHandlers(connection, documents, getOrParse, uriToFsPath, getLexiconForDoc) {
|
|
19
20
|
// 第一个 CodeAction 处理器:能力声明和效果相关的 Quick Fix
|
|
20
21
|
connection.onCodeAction(async (params) => {
|
|
21
22
|
const doc = documents.get(params.textDocument.uri);
|
|
@@ -24,6 +25,8 @@ export function registerCodeActionHandlers(connection, documents, getOrParse, ur
|
|
|
24
25
|
const text = doc.getText();
|
|
25
26
|
const actions = [];
|
|
26
27
|
const capsPath = ConfigService.getInstance().capsManifestPath || '';
|
|
28
|
+
const lexicon = getLexiconForDoc?.(params.textDocument.uri);
|
|
29
|
+
const ui = getLspUiTexts(lexicon);
|
|
27
30
|
for (const d of params.context.diagnostics) {
|
|
28
31
|
const code = d.code || '';
|
|
29
32
|
// 处理缺失的 IO/CPU 效果声明
|
|
@@ -155,7 +158,7 @@ export function registerCodeActionHandlers(connection, documents, getOrParse, ur
|
|
|
155
158
|
if (typeof d.message === 'string' && d.message.startsWith('Ambiguous interop call')) {
|
|
156
159
|
// Advisory hint
|
|
157
160
|
actions.push({
|
|
158
|
-
title:
|
|
161
|
+
title: `${ui.hintPrefix} Disambiguate numeric overload (use 1L or 1.0) — see Guide: JVM Interop Overloads`,
|
|
159
162
|
kind: 'quickfix',
|
|
160
163
|
diagnostics: [d],
|
|
161
164
|
});
|
|
@@ -165,7 +168,7 @@ export function registerCodeActionHandlers(connection, documents, getOrParse, ur
|
|
|
165
168
|
const edits = computeDisambiguationEdits(toks, d.range);
|
|
166
169
|
if (edits.length > 0) {
|
|
167
170
|
actions.push({
|
|
168
|
-
title:
|
|
171
|
+
title: `${ui.fixPrefix} Make numeric literals unambiguous`,
|
|
169
172
|
kind: 'quickfix',
|
|
170
173
|
diagnostics: [d],
|
|
171
174
|
edit: {
|
|
@@ -188,7 +191,7 @@ export function registerCodeActionHandlers(connection, documents, getOrParse, ur
|
|
|
188
191
|
const replacement = suggestNullReplacement(dotted, paramIdx);
|
|
189
192
|
if (replacement !== 'null') {
|
|
190
193
|
actions.push({
|
|
191
|
-
title:
|
|
194
|
+
title: `${ui.fixPrefix} Replace null with ${replacement}`,
|
|
192
195
|
kind: 'quickfix',
|
|
193
196
|
diagnostics: [d],
|
|
194
197
|
edit: {
|
|
@@ -210,7 +213,7 @@ export function registerCodeActionHandlers(connection, documents, getOrParse, ur
|
|
|
210
213
|
const mod = suggestModuleFromPath(fsPath);
|
|
211
214
|
const header = `Module ${mod}.\n`;
|
|
212
215
|
actions.push({
|
|
213
|
-
title:
|
|
216
|
+
title: `${ui.fixPrefix} Add module header (Module ${mod}.)`,
|
|
214
217
|
kind: 'quickfix',
|
|
215
218
|
diagnostics: [d],
|
|
216
219
|
edit: { changes: { [params.textDocument.uri]: [TextEdit.insert({ line: 0, character: 0 }, header)] } },
|
|
@@ -222,7 +225,7 @@ export function registerCodeActionHandlers(connection, documents, getOrParse, ur
|
|
|
222
225
|
const isColon = /:/.test(d.message);
|
|
223
226
|
const ch = isColon ? ':' : '.';
|
|
224
227
|
actions.push({
|
|
225
|
-
title:
|
|
228
|
+
title: `${ui.fixPrefix} add '${ch}' at end of line`,
|
|
226
229
|
kind: 'quickfix',
|
|
227
230
|
diagnostics: [d],
|
|
228
231
|
edit: { changes: { [params.textDocument.uri]: [TextEdit.insert(rng.end, ch)] } },
|
|
@@ -234,7 +237,7 @@ export function registerCodeActionHandlers(connection, documents, getOrParse, ur
|
|
|
234
237
|
// HTTP 传输 PII:建议使用 HTTPS 或加密
|
|
235
238
|
if (code === "E400" /* ErrorCode.PII_HTTP_UNENCRYPTED */ || sinkKind === 'http') {
|
|
236
239
|
actions.push({
|
|
237
|
-
title:
|
|
240
|
+
title: `${ui.hintPrefix} Use HTTPS or encrypt PII before transmission`,
|
|
238
241
|
kind: CodeActionKind.QuickFix,
|
|
239
242
|
diagnostics: [d],
|
|
240
243
|
});
|
|
@@ -246,7 +249,7 @@ export function registerCodeActionHandlers(connection, documents, getOrParse, ur
|
|
|
246
249
|
const varIndex = lineText.indexOf(varName);
|
|
247
250
|
if (varIndex >= 0) {
|
|
248
251
|
actions.push({
|
|
249
|
-
title:
|
|
252
|
+
title: `${ui.fixPrefix} Wrap ${varName} with redact() before sending`,
|
|
250
253
|
kind: CodeActionKind.QuickFix,
|
|
251
254
|
diagnostics: [d],
|
|
252
255
|
edit: {
|
|
@@ -264,7 +267,7 @@ export function registerCodeActionHandlers(connection, documents, getOrParse, ur
|
|
|
264
267
|
// Console/Log PII:建议脱敏或移除
|
|
265
268
|
if (sinkKind === 'console') {
|
|
266
269
|
actions.push({
|
|
267
|
-
title:
|
|
270
|
+
title: `${ui.hintPrefix} Remove PII from logs or use redact()`,
|
|
268
271
|
kind: CodeActionKind.QuickFix,
|
|
269
272
|
diagnostics: [d],
|
|
270
273
|
});
|
|
@@ -272,7 +275,7 @@ export function registerCodeActionHandlers(connection, documents, getOrParse, ur
|
|
|
272
275
|
// Database PII:建议加密存储
|
|
273
276
|
if (sinkKind === 'database') {
|
|
274
277
|
actions.push({
|
|
275
|
-
title:
|
|
278
|
+
title: `${ui.hintPrefix} Encrypt PII before database storage (GDPR Art. 32)`,
|
|
276
279
|
kind: CodeActionKind.QuickFix,
|
|
277
280
|
diagnostics: [d],
|
|
278
281
|
});
|
|
@@ -280,7 +283,7 @@ export function registerCodeActionHandlers(connection, documents, getOrParse, ur
|
|
|
280
283
|
// File PII:建议访问控制
|
|
281
284
|
if (sinkKind === 'file') {
|
|
282
285
|
actions.push({
|
|
283
|
-
title:
|
|
286
|
+
title: `${ui.hintPrefix} Ensure file access control for PII data`,
|
|
284
287
|
kind: CodeActionKind.QuickFix,
|
|
285
288
|
diagnostics: [d],
|
|
286
289
|
});
|
|
@@ -289,7 +292,7 @@ export function registerCodeActionHandlers(connection, documents, getOrParse, ur
|
|
|
289
292
|
if (code === "E403" /* ErrorCode.PII_MISSING_CONSENT_CHECK */ || d.data?.missingConsent) {
|
|
290
293
|
const funcName = d.data?.func || '';
|
|
291
294
|
actions.push({
|
|
292
|
-
title:
|
|
295
|
+
title: `${ui.hintPrefix} Add consent check before processing PII (GDPR Art. 6)`,
|
|
293
296
|
kind: CodeActionKind.QuickFix,
|
|
294
297
|
diagnostics: [d],
|
|
295
298
|
});
|
|
@@ -298,7 +301,7 @@ export function registerCodeActionHandlers(connection, documents, getOrParse, ur
|
|
|
298
301
|
const edit = addConsentAnnotation(text, funcName);
|
|
299
302
|
if (edit) {
|
|
300
303
|
actions.push({
|
|
301
|
-
title:
|
|
304
|
+
title: `${ui.fixPrefix} Add @consent_required annotation to '${funcName}'`,
|
|
302
305
|
kind: CodeActionKind.QuickFix,
|
|
303
306
|
diagnostics: [d],
|
|
304
307
|
edit: {
|
|
@@ -318,7 +321,7 @@ export function registerCodeActionHandlers(connection, documents, getOrParse, ur
|
|
|
318
321
|
const edits = computeDisambiguationEdits(toks, params.range);
|
|
319
322
|
if (edits.length > 0) {
|
|
320
323
|
actions.push({
|
|
321
|
-
title:
|
|
324
|
+
title: `${ui.fixPrefix} Disambiguate numeric overloads in selection`,
|
|
322
325
|
kind: 'quickfix',
|
|
323
326
|
edit: { changes: { [params.textDocument.uri]: edits } },
|
|
324
327
|
});
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"codeaction.js","sourceRoot":"","sources":["../../../src/lsp/codeaction.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"codeaction.js","sourceRoot":"","sources":["../../../src/lsp/codeaction.ts"],"names":[],"mappings":"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"}
|
|
@@ -4,7 +4,8 @@
|
|
|
4
4
|
*/
|
|
5
5
|
import type { Connection } from 'vscode-languageserver/node.js';
|
|
6
6
|
import { TextDocument } from 'vscode-languageserver-textdocument';
|
|
7
|
-
import type { Type as AstType
|
|
7
|
+
import type { Type as AstType } from '../types.js';
|
|
8
|
+
import type { Lexicon } from '../config/lexicons/types.js';
|
|
8
9
|
/**
|
|
9
10
|
* 将 AstType 转换为可读的字符串表示
|
|
10
11
|
* @param t AST 类型节点
|
|
@@ -12,58 +13,10 @@ import type { Type as AstType, Annotation } from '../types.js';
|
|
|
12
13
|
*/
|
|
13
14
|
export declare function typeText(t: AstType): string;
|
|
14
15
|
/**
|
|
15
|
-
*
|
|
16
|
-
* @param annotation 注解对象
|
|
17
|
-
* @returns 格式化的注解字符串
|
|
18
|
-
*
|
|
19
|
-
* @example
|
|
20
|
-
* formatAnnotation({ name: 'NotEmpty', params: new Map() })
|
|
21
|
-
* // => "@NotEmpty"
|
|
22
|
-
*
|
|
23
|
-
* formatAnnotation({ name: 'Range', params: new Map([['min', 0], ['max', 100]]) })
|
|
24
|
-
* // => "@Range(min: 0, max: 100)"
|
|
25
|
-
*
|
|
26
|
-
* formatAnnotation({ name: 'Pattern', params: new Map([['regexp', '^[a-z]+$']]) })
|
|
27
|
-
* // => "@Pattern(regexp: '^[a-z]+$')"
|
|
28
|
-
*/
|
|
29
|
-
export declare function formatAnnotation(annotation: Annotation): string;
|
|
30
|
-
/**
|
|
31
|
-
* 格式化注解数组
|
|
32
|
-
* @param annotations 注解数组(可选)
|
|
33
|
-
* @returns 格式化的注解字符串(空格分隔)
|
|
34
|
-
*
|
|
35
|
-
* @example
|
|
36
|
-
* formatAnnotations(undefined)
|
|
37
|
-
* // => ""
|
|
38
|
-
*
|
|
39
|
-
* formatAnnotations([])
|
|
40
|
-
* // => ""
|
|
41
|
-
*
|
|
42
|
-
* formatAnnotations([
|
|
43
|
-
* { name: 'NotEmpty', params: new Map() },
|
|
44
|
-
* { name: 'Range', params: new Map([['min', 0], ['max', 100]]) }
|
|
45
|
-
* ])
|
|
46
|
-
* // => "@NotEmpty @Range(min: 0, max: 100)"
|
|
47
|
-
*/
|
|
48
|
-
export declare function formatAnnotations(annotations?: readonly Annotation[]): string;
|
|
49
|
-
/**
|
|
50
|
-
* 格式化字段详情(包含注解和类型)
|
|
51
|
-
* @param field 字段对象,包含 type 和可选的 annotations
|
|
52
|
-
* @returns 格式化的详情字符串
|
|
53
|
-
*
|
|
54
|
-
* @example
|
|
55
|
-
* formatFieldDetail({ type: { kind: 'TypeName', name: 'Text' }, annotations: undefined })
|
|
56
|
-
* // => "Text"
|
|
57
|
-
*
|
|
58
|
-
* formatFieldDetail({
|
|
59
|
-
* type: { kind: 'TypeName', name: 'Text' },
|
|
60
|
-
* annotations: [{ name: 'NotEmpty', params: new Map() }]
|
|
61
|
-
* })
|
|
62
|
-
* // => "@NotEmpty Text"
|
|
16
|
+
* 格式化字段详情(类型文本)
|
|
63
17
|
*/
|
|
64
18
|
export declare function formatFieldDetail(field: {
|
|
65
19
|
type: AstType;
|
|
66
|
-
annotations?: readonly Annotation[];
|
|
67
20
|
}): string;
|
|
68
21
|
/**
|
|
69
22
|
* 注册 Completion 相关的 LSP 处理器
|
|
@@ -77,5 +30,5 @@ export declare function registerCompletionHandlers(connection: Connection, docum
|
|
|
77
30
|
text: string;
|
|
78
31
|
tokens: readonly any[];
|
|
79
32
|
ast: any;
|
|
80
|
-
}): void;
|
|
33
|
+
}, getLexiconForDoc?: (uri: string) => Lexicon | undefined): void;
|
|
81
34
|
//# sourceMappingURL=completion.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"completion.d.ts","sourceRoot":"","sources":["../../../src/lsp/completion.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAEH,OAAO,KAAK,EAAE,UAAU,EAAiC,MAAM,+BAA+B,CAAC;AAO/F,OAAO,EAAE,YAAY,EAAE,MAAM,oCAAoC,CAAC;AAGlE,OAAO,KAAK,EAIV,IAAI,IAAI,OAAO,
|
|
1
|
+
{"version":3,"file":"completion.d.ts","sourceRoot":"","sources":["../../../src/lsp/completion.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAEH,OAAO,KAAK,EAAE,UAAU,EAAiC,MAAM,+BAA+B,CAAC;AAO/F,OAAO,EAAE,YAAY,EAAE,MAAM,oCAAoC,CAAC;AAGlE,OAAO,KAAK,EAIV,IAAI,IAAI,OAAO,EAChB,MAAM,aAAa,CAAC;AACrB,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,6BAA6B,CAAC;AAG3D;;;;GAIG;AACH,wBAAgB,QAAQ,CAAC,CAAC,EAAE,OAAO,GAAG,MAAM,CAuB3C;AAED;;GAEG;AACH,wBAAgB,iBAAiB,CAAC,KAAK,EAAE;IAAE,IAAI,EAAE,OAAO,CAAA;CAAE,GAAG,MAAM,CAElE;AAmID;;;;;GAKG;AACH,wBAAgB,0BAA0B,CACxC,UAAU,EAAE,UAAU,EACtB,SAAS,EAAE;IAAE,GAAG,CAAC,GAAG,EAAE,MAAM,GAAG,YAAY,GAAG,SAAS,CAAA;CAAE,EACzD,UAAU,EAAE,CAAC,GAAG,EAAE,YAAY,KAAK;IAAE,IAAI,EAAE,MAAM,CAAC;IAAC,MAAM,EAAE,SAAS,GAAG,EAAE,CAAC;IAAC,GAAG,EAAE,GAAG,CAAA;CAAE,EACrF,gBAAgB,CAAC,EAAE,CAAC,GAAG,EAAE,MAAM,KAAK,OAAO,GAAG,SAAS,GACtD,IAAI,CAsFN"}
|
|
@@ -5,6 +5,7 @@
|
|
|
5
5
|
import { CompletionItemKind, } from 'vscode-languageserver/node.js';
|
|
6
6
|
import { parse } from '../parser.js';
|
|
7
7
|
import { KW, TokenKind } from '../frontend/tokens.js';
|
|
8
|
+
import { getLspUiTexts } from '../config/lexicons/lsp-ui-texts.js';
|
|
8
9
|
/**
|
|
9
10
|
* 将 AstType 转换为可读的字符串表示
|
|
10
11
|
* @param t AST 类型节点
|
|
@@ -35,78 +36,10 @@ export function typeText(t) {
|
|
|
35
36
|
}
|
|
36
37
|
}
|
|
37
38
|
/**
|
|
38
|
-
*
|
|
39
|
-
* @param annotation 注解对象
|
|
40
|
-
* @returns 格式化的注解字符串
|
|
41
|
-
*
|
|
42
|
-
* @example
|
|
43
|
-
* formatAnnotation({ name: 'NotEmpty', params: new Map() })
|
|
44
|
-
* // => "@NotEmpty"
|
|
45
|
-
*
|
|
46
|
-
* formatAnnotation({ name: 'Range', params: new Map([['min', 0], ['max', 100]]) })
|
|
47
|
-
* // => "@Range(min: 0, max: 100)"
|
|
48
|
-
*
|
|
49
|
-
* formatAnnotation({ name: 'Pattern', params: new Map([['regexp', '^[a-z]+$']]) })
|
|
50
|
-
* // => "@Pattern(regexp: '^[a-z]+$')"
|
|
51
|
-
*/
|
|
52
|
-
export function formatAnnotation(annotation) {
|
|
53
|
-
if (annotation.params.size === 0) {
|
|
54
|
-
return `@${annotation.name}`;
|
|
55
|
-
}
|
|
56
|
-
const params = Array.from(annotation.params.entries())
|
|
57
|
-
.map(([k, v]) => {
|
|
58
|
-
if (typeof v === 'string') {
|
|
59
|
-
// 使用单引号,转义内部单引号
|
|
60
|
-
const escaped = String(v).replace(/'/g, "\\'");
|
|
61
|
-
return `${k}: '${escaped}'`;
|
|
62
|
-
}
|
|
63
|
-
return `${k}: ${v}`;
|
|
64
|
-
})
|
|
65
|
-
.join(', ');
|
|
66
|
-
return `@${annotation.name}(${params})`;
|
|
67
|
-
}
|
|
68
|
-
/**
|
|
69
|
-
* 格式化注解数组
|
|
70
|
-
* @param annotations 注解数组(可选)
|
|
71
|
-
* @returns 格式化的注解字符串(空格分隔)
|
|
72
|
-
*
|
|
73
|
-
* @example
|
|
74
|
-
* formatAnnotations(undefined)
|
|
75
|
-
* // => ""
|
|
76
|
-
*
|
|
77
|
-
* formatAnnotations([])
|
|
78
|
-
* // => ""
|
|
79
|
-
*
|
|
80
|
-
* formatAnnotations([
|
|
81
|
-
* { name: 'NotEmpty', params: new Map() },
|
|
82
|
-
* { name: 'Range', params: new Map([['min', 0], ['max', 100]]) }
|
|
83
|
-
* ])
|
|
84
|
-
* // => "@NotEmpty @Range(min: 0, max: 100)"
|
|
85
|
-
*/
|
|
86
|
-
export function formatAnnotations(annotations) {
|
|
87
|
-
if (!annotations || annotations.length === 0) {
|
|
88
|
-
return '';
|
|
89
|
-
}
|
|
90
|
-
return annotations.map(formatAnnotation).join(' ');
|
|
91
|
-
}
|
|
92
|
-
/**
|
|
93
|
-
* 格式化字段详情(包含注解和类型)
|
|
94
|
-
* @param field 字段对象,包含 type 和可选的 annotations
|
|
95
|
-
* @returns 格式化的详情字符串
|
|
96
|
-
*
|
|
97
|
-
* @example
|
|
98
|
-
* formatFieldDetail({ type: { kind: 'TypeName', name: 'Text' }, annotations: undefined })
|
|
99
|
-
* // => "Text"
|
|
100
|
-
*
|
|
101
|
-
* formatFieldDetail({
|
|
102
|
-
* type: { kind: 'TypeName', name: 'Text' },
|
|
103
|
-
* annotations: [{ name: 'NotEmpty', params: new Map() }]
|
|
104
|
-
* })
|
|
105
|
-
* // => "@NotEmpty Text"
|
|
39
|
+
* 格式化字段详情(类型文本)
|
|
106
40
|
*/
|
|
107
41
|
export function formatFieldDetail(field) {
|
|
108
|
-
|
|
109
|
-
return annots ? `${annots} ${typeText(field.type)}` : typeText(field.type);
|
|
42
|
+
return typeText(field.type);
|
|
110
43
|
}
|
|
111
44
|
/**
|
|
112
45
|
* 比较 LSP Position(0-based)与 AST Coord(1-based)
|
|
@@ -147,18 +80,14 @@ function findFuncDeclByName(m, name) {
|
|
|
147
80
|
* @returns LSP 签名信息对象,包含函数签名和参数列表
|
|
148
81
|
*/
|
|
149
82
|
function buildSignatureInformation(f) {
|
|
150
|
-
const paramLabels = f.params.map(p => {
|
|
151
|
-
const annots = formatAnnotations(p.annotations);
|
|
152
|
-
const annotPrefix = annots ? `${annots} ` : '';
|
|
153
|
-
return `${annotPrefix}${p.name}: ${typeText(p.type)}`;
|
|
154
|
-
});
|
|
83
|
+
const paramLabels = f.params.map(p => `${p.name}: ${typeText(p.type)}`);
|
|
155
84
|
const info = {
|
|
156
85
|
label: `${f.name}(${paramLabels.join(', ')}) -> ${typeText(f.retType)}`,
|
|
157
86
|
parameters: paramLabels.map(label => ({ label })),
|
|
158
87
|
};
|
|
159
88
|
const effects = f.effects ?? [];
|
|
160
89
|
if (effects.length > 0) {
|
|
161
|
-
info.documentation =
|
|
90
|
+
info.documentation = `Effects: ${effects.join(', ')}`;
|
|
162
91
|
}
|
|
163
92
|
return info;
|
|
164
93
|
}
|
|
@@ -259,7 +188,7 @@ function findCallInfoAt(tokens, pos) {
|
|
|
259
188
|
* @param documents 文档管理器,提供 get 方法按 URI 获取文档
|
|
260
189
|
* @param getOrParse 文档解析函数,返回文本、词法标记和 AST
|
|
261
190
|
*/
|
|
262
|
-
export function registerCompletionHandlers(connection, documents, getOrParse) {
|
|
191
|
+
export function registerCompletionHandlers(connection, documents, getOrParse, getLexiconForDoc) {
|
|
263
192
|
// 代码补全:提供关键字和类型补全
|
|
264
193
|
connection.onCompletion(() => {
|
|
265
194
|
// 获取所有关键字
|
|
@@ -292,17 +221,20 @@ export function registerCompletionHandlers(connection, documents, getOrParse) {
|
|
|
292
221
|
});
|
|
293
222
|
// 补全项解析:为选中的补全项提供额外信息
|
|
294
223
|
connection.onCompletionResolve((item) => {
|
|
224
|
+
// getLexiconForDoc('') 返回全局 lexicon(无 per-doc override 时的回退)
|
|
225
|
+
const lexicon = getLexiconForDoc?.('');
|
|
226
|
+
const ui = getLspUiTexts(lexicon);
|
|
295
227
|
if (item.data === 'module') {
|
|
296
|
-
item.detail =
|
|
297
|
-
item.documentation =
|
|
228
|
+
item.detail = ui.moduleDeclaration;
|
|
229
|
+
item.documentation = ui.moduleDeclarationDoc;
|
|
298
230
|
}
|
|
299
231
|
else if (item.data === 'define') {
|
|
300
|
-
item.detail =
|
|
301
|
-
item.documentation =
|
|
232
|
+
item.detail = ui.typeDefinition;
|
|
233
|
+
item.documentation = ui.typeDefinitionDoc;
|
|
302
234
|
}
|
|
303
235
|
else if (item.data === 'rule') {
|
|
304
|
-
item.detail =
|
|
305
|
-
item.documentation =
|
|
236
|
+
item.detail = ui.functionDefinition;
|
|
237
|
+
item.documentation = ui.functionDefinitionDoc;
|
|
306
238
|
}
|
|
307
239
|
return item;
|
|
308
240
|
});
|
|
@@ -315,7 +247,7 @@ export function registerCompletionHandlers(connection, documents, getOrParse) {
|
|
|
315
247
|
const { tokens: toks, ast } = entry;
|
|
316
248
|
let moduleAst;
|
|
317
249
|
try {
|
|
318
|
-
moduleAst = ast || parse(toks);
|
|
250
|
+
moduleAst = ast || parse(toks).ast;
|
|
319
251
|
}
|
|
320
252
|
catch {
|
|
321
253
|
return null;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"completion.js","sourceRoot":"","sources":["../../../src/lsp/completion.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAGH,OAAO,EACL,kBAAkB,GAInB,MAAM,+BAA+B,CAAC;AAEvC,OAAO,EAAE,KAAK,EAAE,MAAM,cAAc,CAAC;AACrC,OAAO,EAAE,EAAE,EAAE,SAAS,EAAE,MAAM,uBAAuB,CAAC;
|
|
1
|
+
{"version":3,"file":"completion.js","sourceRoot":"","sources":["../../../src/lsp/completion.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,6 +1,7 @@
|
|
|
1
1
|
import type { Diagnostic, Connection } from 'vscode-languageserver/node.js';
|
|
2
2
|
import { type WorkspaceDocumentDiagnosticReport } from 'vscode-languageserver/node.js';
|
|
3
3
|
import { TextDocument } from 'vscode-languageserver-textdocument';
|
|
4
|
+
import type { Lexicon } from '../config/lexicons/types.js';
|
|
4
5
|
import type { CapabilityManifest } from '../effects/capabilities.js';
|
|
5
6
|
/**
|
|
6
7
|
* 表示诊断模块的配置选项。
|
|
@@ -54,7 +55,7 @@ export declare function computeDiagnostics(textDocument: TextDocument, getOrPars
|
|
|
54
55
|
text: string;
|
|
55
56
|
tokens: readonly any[];
|
|
56
57
|
ast: any;
|
|
57
|
-
}): Promise<Diagnostic[]>;
|
|
58
|
+
}, lexicon?: Lexicon): Promise<Diagnostic[]>;
|
|
58
59
|
/**
|
|
59
60
|
* 批次并行计算工作区内所有文档的诊断。
|
|
60
61
|
* @param modules 模块列表。
|
|
@@ -89,5 +90,5 @@ export declare function registerDiagnosticHandlers(connection: Connection, docum
|
|
|
89
90
|
text: string;
|
|
90
91
|
tokens: readonly any[];
|
|
91
92
|
ast: any;
|
|
92
|
-
}): void;
|
|
93
|
+
}, getLexiconForDoc?: (uri: string) => Lexicon | undefined): void;
|
|
93
94
|
//# sourceMappingURL=diagnostics.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"diagnostics.d.ts","sourceRoot":"","sources":["../../../src/lsp/diagnostics.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,UAAU,EAAE,UAAU,EAAS,MAAM,+BAA+B,CAAC;AACnF,OAAO,EAOL,KAAK,iCAAiC,EACvC,MAAM,+BAA+B,CAAC;AACvC,OAAO,EAAE,YAAY,EAAE,MAAM,oCAAoC,CAAC;
|
|
1
|
+
{"version":3,"file":"diagnostics.d.ts","sourceRoot":"","sources":["../../../src/lsp/diagnostics.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,UAAU,EAAE,UAAU,EAAS,MAAM,+BAA+B,CAAC;AACnF,OAAO,EAOL,KAAK,iCAAiC,EACvC,MAAM,+BAA+B,CAAC;AACvC,OAAO,EAAE,YAAY,EAAE,MAAM,oCAAoC,CAAC;AAWlE,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,6BAA6B,CAAC;AAI3D,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,4BAA4B,CAAC;AAIrE;;GAEG;AACH,MAAM,WAAW,gBAAgB;IAC/B;;OAEG;IACH,2BAA2B,EAAE,OAAO,CAAC;IACrC;;OAEG;IACH,2BAA2B,EAAE,OAAO,CAAC;IACrC;;OAEG;IACH,sBAAsB,EAAE,MAAM,GAAG,IAAI,CAAC;CACvC;AAeD,wBAAgB,oBAAoB,CAAC,KAAK,EAAE,SAAS,MAAM,EAAE,GAAG,IAAI,CAEnE;AAgHD;;;GAGG;AACH,wBAAgB,yBAAyB,CAAC,GAAG,EAAE,MAAM,GAAG,IAAI,CAE3D;AAED;;;GAGG;AACH,wBAAgB,wBAAwB,CAAC,GAAG,EAAE,MAAM,GAAG,IAAI,CAkB1D;AAED;;;GAGG;AACH,wBAAsB,sBAAsB,IAAI,OAAO,CAAC,kBAAkB,GAAG,IAAI,CAAC,CAmBjF;AAED;;GAEG;AACH,wBAAgB,uBAAuB,IAAI,IAAI,CAE9C;AAED;;;GAGG;AACH,wBAAgB,mBAAmB,CAAC,MAAM,EAAE,OAAO,CAAC,gBAAgB,CAAC,GAAG,IAAI,CAK3E;AAED;;;;;GAKG;AACH,wBAAsB,kBAAkB,CACtC,YAAY,EAAE,YAAY,EAC1B,UAAU,EAAE,CAAC,GAAG,EAAE,YAAY,KAAK;IAAE,IAAI,EAAE,MAAM,CAAC;IAAC,MAAM,EAAE,SAAS,GAAG,EAAE,CAAC;IAAC,GAAG,EAAE,GAAG,CAAA;CAAE,EACrF,OAAO,CAAC,EAAE,OAAO,GAChB,OAAO,CAAC,UAAU,EAAE,CAAC,CAmLvB;AAgCD;;;;;;GAMG;AACH,wBAAsB,2BAA2B,CAC/C,OAAO,EAAE,KAAK,CAAC;IAAE,GAAG,EAAE,MAAM,CAAA;CAAE,CAAC,EAC/B,SAAS,EAAE;IAAE,GAAG,CAAC,GAAG,EAAE,MAAM,GAAG,YAAY,GAAG,SAAS,CAAA;CAAE,EACzD,UAAU,EAAE,CAAC,GAAG,EAAE,YAAY,KAAK;IAAE,IAAI,EAAE,MAAM,CAAC;IAAC,MAAM,EAAE,SAAS,GAAG,EAAE,CAAC;IAAC,GAAG,EAAE,GAAG,CAAA;CAAE,GACpF,OAAO,CAAC,iCAAiC,EAAE,CAAC,CAoC9C;AAQD;;;;GAIG;AACH,wBAAsB,eAAe,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAsBhE;AAED;;;;;GAKG;AACH,wBAAgB,0BAA0B,CACxC,UAAU,EAAE,UAAU,EACtB,SAAS,EAAE;IAAE,GAAG,CAAC,GAAG,EAAE,MAAM,GAAG,YAAY,GAAG,SAAS,CAAA;CAAE,EACzD,UAAU,EAAE,CAAC,GAAG,EAAE,YAAY,KAAK;IAAE,IAAI,EAAE,MAAM,CAAC;IAAC,MAAM,EAAE,SAAS,GAAG,EAAE,CAAC;IAAC,GAAG,EAAE,GAAG,CAAA;CAAE,EACrF,gBAAgB,CAAC,EAAE,CAAC,GAAG,EAAE,MAAM,KAAK,OAAO,GAAG,SAAS,GACtD,IAAI,CA0EN"}
|
|
@@ -6,6 +6,7 @@ import { getAllModules } from './index.js';
|
|
|
6
6
|
import { typecheckModule, typecheckModuleWithCapabilities, } from '../typecheck.js';
|
|
7
7
|
import { parse } from '../parser.js';
|
|
8
8
|
import { lowerModule } from '../lower_to_core.js';
|
|
9
|
+
import { getLspUiTexts } from '../config/lexicons/lsp-ui-texts.js';
|
|
9
10
|
import { DiagnosticError } from '../diagnostics/diagnostics.js';
|
|
10
11
|
import { collectSemanticDiagnostics } from './analysis.js';
|
|
11
12
|
import { ConfigService } from '../config/config-service.js';
|
|
@@ -169,7 +170,7 @@ export function setDiagnosticConfig(config) {
|
|
|
169
170
|
* @param getOrParse 获取缓存的解析结果函数。
|
|
170
171
|
* @returns 诊断列表。
|
|
171
172
|
*/
|
|
172
|
-
export async function computeDiagnostics(textDocument, getOrParse) {
|
|
173
|
+
export async function computeDiagnostics(textDocument, getOrParse, lexicon) {
|
|
173
174
|
const startTime = Date.now();
|
|
174
175
|
// 检查诊断缓存
|
|
175
176
|
const uri = textDocument.uri;
|
|
@@ -209,7 +210,7 @@ export async function computeDiagnostics(textDocument, getOrParse) {
|
|
|
209
210
|
const typecheckStart = Date.now();
|
|
210
211
|
const manifest = await loadCapabilityManifest();
|
|
211
212
|
const moduleSearchPaths = buildModuleSearchPaths(uri);
|
|
212
|
-
const typecheckOptions = { uri, moduleSearchPaths };
|
|
213
|
+
const typecheckOptions = { uri, moduleSearchPaths, lexicon };
|
|
213
214
|
tdiags = manifest
|
|
214
215
|
? typecheckModuleWithCapabilities(core, manifest, typecheckOptions)
|
|
215
216
|
: typecheckModule(core, typecheckOptions);
|
|
@@ -318,10 +319,11 @@ export async function computeDiagnostics(textDocument, getOrParse) {
|
|
|
318
319
|
// 如果缺少模块头,添加温和的警告
|
|
319
320
|
const a = ast ?? parse(tokens);
|
|
320
321
|
if (!a || !a.name) {
|
|
322
|
+
const ui = getLspUiTexts(lexicon);
|
|
321
323
|
diagnostics.push({
|
|
322
324
|
severity: DiagnosticSeverity.Warning,
|
|
323
325
|
range: { start: { line: 0, character: 0 }, end: { line: 0, character: 0 } },
|
|
324
|
-
message:
|
|
326
|
+
message: ui.missingModuleHeader,
|
|
325
327
|
source: 'aster',
|
|
326
328
|
});
|
|
327
329
|
}
|
|
@@ -411,6 +413,7 @@ export async function computeWorkspaceDiagnostics(modules, documents, getOrParse
|
|
|
411
413
|
let connectionRef = null;
|
|
412
414
|
let documentsRef = null;
|
|
413
415
|
let getOrParseRef = null;
|
|
416
|
+
let getLexiconForDocRef = null;
|
|
414
417
|
/**
|
|
415
418
|
* 推送诊断到客户端(push-based diagnostics)。
|
|
416
419
|
* 用于在文档变更后主动向客户端发送诊断信息。
|
|
@@ -425,7 +428,8 @@ export async function pushDiagnostics(uri) {
|
|
|
425
428
|
return;
|
|
426
429
|
}
|
|
427
430
|
try {
|
|
428
|
-
const
|
|
431
|
+
const lexicon = getLexiconForDocRef?.(uri);
|
|
432
|
+
const diagnostics = await computeDiagnostics(doc, getOrParseRef, lexicon);
|
|
429
433
|
connectionRef.sendDiagnostics({
|
|
430
434
|
uri,
|
|
431
435
|
version: doc.version,
|
|
@@ -443,11 +447,12 @@ export async function pushDiagnostics(uri) {
|
|
|
443
447
|
* @param documents 文档管理器。
|
|
444
448
|
* @param getOrParse 获取缓存解析结果的函数。
|
|
445
449
|
*/
|
|
446
|
-
export function registerDiagnosticHandlers(connection, documents, getOrParse) {
|
|
450
|
+
export function registerDiagnosticHandlers(connection, documents, getOrParse, getLexiconForDoc) {
|
|
447
451
|
// 保存引用用于推送诊断
|
|
448
452
|
connectionRef = connection;
|
|
449
453
|
documentsRef = documents;
|
|
450
454
|
getOrParseRef = getOrParse;
|
|
455
|
+
getLexiconForDocRef = getLexiconForDoc ?? null;
|
|
451
456
|
// LSP 3.17+ pull diagnostics handler
|
|
452
457
|
connection.onRequest(DocumentDiagnosticRequest.type, async (params) => {
|
|
453
458
|
try {
|
|
@@ -455,7 +460,8 @@ export function registerDiagnosticHandlers(connection, documents, getOrParse) {
|
|
|
455
460
|
if (!doc) {
|
|
456
461
|
return { kind: DocumentDiagnosticReportKind.Full, items: [] };
|
|
457
462
|
}
|
|
458
|
-
const
|
|
463
|
+
const lexicon = getLexiconForDoc?.(params.textDocument.uri);
|
|
464
|
+
const items = await computeDiagnostics(doc, getOrParse, lexicon);
|
|
459
465
|
return { kind: DocumentDiagnosticReportKind.Full, items };
|
|
460
466
|
}
|
|
461
467
|
catch (error) {
|
|
@@ -481,7 +487,8 @@ export function registerDiagnosticHandlers(connection, documents, getOrParse) {
|
|
|
481
487
|
try {
|
|
482
488
|
let diagnostics;
|
|
483
489
|
if (doc) {
|
|
484
|
-
|
|
490
|
+
const docLexicon = getLexiconForDoc?.(rec.uri);
|
|
491
|
+
diagnostics = await computeDiagnostics(doc, getOrParse, docLexicon);
|
|
485
492
|
}
|
|
486
493
|
else if (cached) {
|
|
487
494
|
diagnostics = cached.diagnostics;
|