@aster-cloud/aster-lang-ts 1.0.37 → 1.2.0
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 +68 -0
- package/README.md +13 -7
- package/dist/scripts/aster.js +10 -5
- package/dist/scripts/aster.js.map +1 -1
- package/dist/scripts/core-ir-json.js +8 -3
- package/dist/scripts/core-ir-json.js.map +1 -1
- package/dist/scripts/emit-classfiles.js +3 -2
- package/dist/scripts/emit-classfiles.js.map +1 -1
- package/dist/scripts/emit-core.js +8 -5
- package/dist/scripts/emit-core.js.map +1 -1
- package/dist/scripts/generate-casefold.d.ts +2 -0
- package/dist/scripts/generate-casefold.d.ts.map +1 -0
- package/dist/scripts/generate-casefold.js +34 -0
- package/dist/scripts/generate-casefold.js.map +1 -0
- package/dist/scripts/generate-diagnostic-overlays.d.ts +29 -0
- package/dist/scripts/generate-diagnostic-overlays.d.ts.map +1 -0
- package/dist/scripts/generate-diagnostic-overlays.js +90 -0
- package/dist/scripts/generate-diagnostic-overlays.js.map +1 -0
- package/dist/scripts/golden.js +45 -20
- package/dist/scripts/golden.js.map +1 -1
- package/dist/scripts/perf-benchmark.js +1 -0
- package/dist/scripts/perf-benchmark.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 +3 -8
- package/dist/scripts/repl.js.map +1 -1
- package/dist/scripts/typecheck-cli.js +10 -9
- package/dist/scripts/typecheck-cli.js.map +1 -1
- package/dist/scripts/update-eff-violation-expected.js +6 -6
- package/dist/scripts/update-eff-violation-expected.js.map +1 -1
- package/dist/scripts/verify-capabilities.js +3 -6
- package/dist/scripts/verify-capabilities.js.map +1 -1
- package/dist/scripts/verify-lexicon-sync.js +26 -0
- package/dist/scripts/verify-lexicon-sync.js.map +1 -1
- package/dist/src/ai/validator.d.ts +1 -1
- package/dist/src/ai/validator.d.ts.map +1 -1
- package/dist/src/ai/validator.js +12 -12
- package/dist/src/ai/validator.js.map +1 -1
- package/dist/src/ast/ast.d.ts +2 -0
- package/dist/src/ast/ast.d.ts.map +1 -1
- package/dist/src/ast/ast.js +6 -0
- package/dist/src/ast/ast.js.map +1 -1
- package/dist/src/ast/type-nodes.d.ts +25 -0
- package/dist/src/ast/type-nodes.d.ts.map +1 -0
- package/dist/src/ast/type-nodes.js +56 -0
- package/dist/src/ast/type-nodes.js.map +1 -0
- package/dist/src/browser.d.ts +27 -10
- package/dist/src/browser.d.ts.map +1 -1
- package/dist/src/browser.js +44 -55
- package/dist/src/browser.js.map +1 -1
- package/dist/src/cli/policy-converter.js +5 -9
- package/dist/src/cli/policy-converter.js.map +1 -1
- package/dist/src/cnl-printer.d.ts.map +1 -1
- package/dist/src/cnl-printer.js +10 -9
- package/dist/src/cnl-printer.js.map +1 -1
- package/dist/src/compile-pipeline.d.ts +48 -0
- package/dist/src/compile-pipeline.d.ts.map +1 -0
- package/dist/src/compile-pipeline.js +89 -0
- package/dist/src/compile-pipeline.js.map +1 -0
- package/dist/src/config/lexicons/diagnostic-messages.d.ts +7 -5
- package/dist/src/config/lexicons/diagnostic-messages.d.ts.map +1 -1
- package/dist/src/config/lexicons/diagnostic-messages.js +17 -105
- package/dist/src/config/lexicons/diagnostic-messages.js.map +1 -1
- package/dist/src/config/lexicons/diagnostic-overlays.generated.d.ts +9 -0
- package/dist/src/config/lexicons/diagnostic-overlays.generated.d.ts.map +1 -0
- package/dist/src/config/lexicons/diagnostic-overlays.generated.js +615 -0
- package/dist/src/config/lexicons/diagnostic-overlays.generated.js.map +1 -0
- package/dist/src/config/lexicons/identifiers/casefold-table.generated.d.ts +9 -0
- package/dist/src/config/lexicons/identifiers/casefold-table.generated.d.ts.map +1 -0
- package/dist/src/config/lexicons/identifiers/casefold-table.generated.js +1467 -0
- package/dist/src/config/lexicons/identifiers/casefold-table.generated.js.map +1 -0
- package/dist/src/config/lexicons/identifiers/casefold.d.ts +7 -0
- package/dist/src/config/lexicons/identifiers/casefold.d.ts.map +1 -0
- package/dist/src/config/lexicons/identifiers/casefold.js +37 -0
- package/dist/src/config/lexicons/identifiers/casefold.js.map +1 -0
- package/dist/src/config/lexicons/identifiers/domains/finance.loan.de-DE.d.ts.map +1 -1
- package/dist/src/config/lexicons/identifiers/domains/finance.loan.de-DE.js +8 -0
- package/dist/src/config/lexicons/identifiers/domains/finance.loan.de-DE.js.map +1 -1
- package/dist/src/config/lexicons/identifiers/domains/finance.loan.en-US.d.ts.map +1 -1
- package/dist/src/config/lexicons/identifiers/domains/finance.loan.en-US.js +8 -0
- package/dist/src/config/lexicons/identifiers/domains/finance.loan.en-US.js.map +1 -1
- package/dist/src/config/lexicons/identifiers/domains/finance.loan.zh-CN.d.ts.map +1 -1
- package/dist/src/config/lexicons/identifiers/domains/finance.loan.zh-CN.js +8 -0
- package/dist/src/config/lexicons/identifiers/domains/finance.loan.zh-CN.js.map +1 -1
- package/dist/src/config/lexicons/identifiers/domains/insurance.auto.de-DE.d.ts.map +1 -1
- package/dist/src/config/lexicons/identifiers/domains/insurance.auto.de-DE.js +6 -0
- package/dist/src/config/lexicons/identifiers/domains/insurance.auto.de-DE.js.map +1 -1
- package/dist/src/config/lexicons/identifiers/domains/insurance.auto.en-US.d.ts.map +1 -1
- package/dist/src/config/lexicons/identifiers/domains/insurance.auto.en-US.js +6 -0
- package/dist/src/config/lexicons/identifiers/domains/insurance.auto.en-US.js.map +1 -1
- package/dist/src/config/lexicons/identifiers/domains/insurance.auto.zh-CN.d.ts.map +1 -1
- package/dist/src/config/lexicons/identifiers/domains/insurance.auto.zh-CN.js +6 -0
- package/dist/src/config/lexicons/identifiers/domains/insurance.auto.zh-CN.js.map +1 -1
- package/dist/src/config/lexicons/identifiers/index.d.ts +7 -9
- package/dist/src/config/lexicons/identifiers/index.d.ts.map +1 -1
- package/dist/src/config/lexicons/identifiers/index.js +8 -9
- package/dist/src/config/lexicons/identifiers/index.js.map +1 -1
- package/dist/src/config/lexicons/identifiers/registry.d.ts +11 -5
- package/dist/src/config/lexicons/identifiers/registry.d.ts.map +1 -1
- package/dist/src/config/lexicons/identifiers/registry.js +20 -14
- package/dist/src/config/lexicons/identifiers/registry.js.map +1 -1
- package/dist/src/config/lexicons/identifiers/scopes.d.ts +52 -0
- package/dist/src/config/lexicons/identifiers/scopes.d.ts.map +1 -0
- package/dist/src/config/lexicons/identifiers/scopes.js +166 -0
- package/dist/src/config/lexicons/identifiers/scopes.js.map +1 -0
- package/dist/src/config/lexicons/identifiers/types.d.ts +15 -29
- package/dist/src/config/lexicons/identifiers/types.d.ts.map +1 -1
- package/dist/src/config/lexicons/identifiers/types.js +91 -101
- package/dist/src/config/lexicons/identifiers/types.js.map +1 -1
- package/dist/src/config/lexicons/lsp-ui-texts.d.ts +7 -0
- package/dist/src/config/lexicons/lsp-ui-texts.d.ts.map +1 -1
- package/dist/src/config/lexicons/lsp-ui-texts.js +12 -0
- package/dist/src/config/lexicons/lsp-ui-texts.js.map +1 -1
- package/dist/src/config/semantic.d.ts +5 -0
- package/dist/src/config/semantic.d.ts.map +1 -1
- package/dist/src/config/semantic.js +12 -0
- package/dist/src/config/semantic.js.map +1 -1
- package/dist/src/core/core_ir.d.ts +2 -0
- package/dist/src/core/core_ir.d.ts.map +1 -1
- package/dist/src/core/core_ir.js +6 -0
- package/dist/src/core/core_ir.js.map +1 -1
- package/dist/src/core/inferred_fields.d.ts +10 -0
- package/dist/src/core/inferred_fields.d.ts.map +1 -1
- package/dist/src/core/inferred_fields.js +9 -0
- package/dist/src/core/inferred_fields.js.map +1 -1
- package/dist/src/core/interpreter.d.ts.map +1 -1
- package/dist/src/core/interpreter.js +12 -10
- package/dist/src/core/interpreter.js.map +1 -1
- package/dist/src/core/resolution-mark.d.ts +28 -0
- package/dist/src/core/resolution-mark.d.ts.map +1 -0
- package/dist/src/core/resolution-mark.js +19 -0
- package/dist/src/core/resolution-mark.js.map +1 -0
- package/dist/src/core/resolve-typed-references.d.ts +36 -0
- package/dist/src/core/resolve-typed-references.d.ts.map +1 -0
- package/dist/src/core/resolve-typed-references.js +703 -0
- package/dist/src/core/resolve-typed-references.js.map +1 -0
- package/dist/src/diagnostics/error_codes.d.ts +11 -1
- package/dist/src/diagnostics/error_codes.d.ts.map +1 -1
- package/dist/src/diagnostics/error_codes.js +80 -0
- package/dist/src/diagnostics/error_codes.js.map +1 -1
- package/dist/src/frontend/canonicalizer.d.ts +8 -13
- package/dist/src/frontend/canonicalizer.d.ts.map +1 -1
- package/dist/src/frontend/canonicalizer.js +19 -48
- package/dist/src/frontend/canonicalizer.js.map +1 -1
- package/dist/src/frontend/resolution-choice.d.ts +34 -0
- package/dist/src/frontend/resolution-choice.d.ts.map +1 -0
- package/dist/src/frontend/resolution-choice.js +69 -0
- package/dist/src/frontend/resolution-choice.js.map +1 -0
- package/dist/src/frontend/resolution-context.d.ts +28 -0
- package/dist/src/frontend/resolution-context.d.ts.map +1 -0
- package/dist/src/frontend/resolution-context.js +7 -0
- package/dist/src/frontend/resolution-context.js.map +1 -0
- package/dist/src/frontend/resolve-declarations.d.ts +13 -0
- package/dist/src/frontend/resolve-declarations.d.ts.map +1 -0
- package/dist/src/frontend/resolve-declarations.js +595 -0
- package/dist/src/frontend/resolve-declarations.js.map +1 -0
- package/dist/src/frontend/resolve-policy-types.d.ts +54 -0
- package/dist/src/frontend/resolve-policy-types.d.ts.map +1 -0
- package/dist/src/frontend/resolve-policy-types.js +71 -0
- package/dist/src/frontend/resolve-policy-types.js.map +1 -0
- package/dist/src/index.d.ts +14 -7
- package/dist/src/index.d.ts.map +1 -1
- package/dist/src/index.js +14 -7
- package/dist/src/index.js.map +1 -1
- package/dist/src/lower_to_core.d.ts +2 -16
- package/dist/src/lower_to_core.d.ts.map +1 -1
- package/dist/src/lower_to_core.js +105 -44
- package/dist/src/lower_to_core.js.map +1 -1
- package/dist/src/lsp/canonicalize-options.d.ts +8 -11
- package/dist/src/lsp/canonicalize-options.d.ts.map +1 -1
- package/dist/src/lsp/canonicalize-options.js +8 -8
- package/dist/src/lsp/canonicalize-options.js.map +1 -1
- package/dist/src/lsp/completion.d.ts +55 -5
- package/dist/src/lsp/completion.d.ts.map +1 -1
- package/dist/src/lsp/completion.js +149 -0
- package/dist/src/lsp/completion.js.map +1 -1
- package/dist/src/lsp/diagnostics.d.ts +2 -0
- package/dist/src/lsp/diagnostics.d.ts.map +1 -1
- package/dist/src/lsp/diagnostics.js +84 -73
- package/dist/src/lsp/diagnostics.js.map +1 -1
- package/dist/src/lsp/navigation/definition.d.ts +2 -1
- package/dist/src/lsp/navigation/definition.d.ts.map +1 -1
- package/dist/src/lsp/navigation/definition.js +35 -1
- package/dist/src/lsp/navigation/definition.js.map +1 -1
- package/dist/src/lsp/navigation/hover.d.ts +12 -5
- package/dist/src/lsp/navigation/hover.d.ts.map +1 -1
- package/dist/src/lsp/navigation/hover.js +136 -90
- package/dist/src/lsp/navigation/hover.js.map +1 -1
- package/dist/src/lsp/parse-document.d.ts +4 -1
- package/dist/src/lsp/parse-document.d.ts.map +1 -1
- package/dist/src/lsp/parse-document.js +20 -17
- package/dist/src/lsp/parse-document.js.map +1 -1
- package/dist/src/lsp/resolution.d.ts +40 -0
- package/dist/src/lsp/resolution.d.ts.map +1 -0
- package/dist/src/lsp/resolution.js +179 -0
- package/dist/src/lsp/resolution.js.map +1 -0
- package/dist/src/lsp/server.js +3 -1
- package/dist/src/lsp/server.js.map +1 -1
- package/dist/src/lsp/source-positions.d.ts +2 -8
- package/dist/src/lsp/source-positions.d.ts.map +1 -1
- package/dist/src/lsp/source-positions.js +4 -16
- package/dist/src/lsp/source-positions.js.map +1 -1
- package/dist/src/mapping/pipeline.js +3 -2
- package/dist/src/mapping/pipeline.js.map +1 -1
- package/dist/src/mapping/review-queue.d.ts.map +1 -1
- package/dist/src/mapping/review-queue.js +3 -2
- package/dist/src/mapping/review-queue.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 +1 -0
- package/dist/src/parser/context.js.map +1 -1
- package/dist/src/parser/decl-parser.d.ts.map +1 -1
- package/dist/src/parser/decl-parser.js +7 -5
- package/dist/src/parser/decl-parser.js.map +1 -1
- package/dist/src/parser/expr-stmt-parser.d.ts.map +1 -1
- package/dist/src/parser/expr-stmt-parser.js +2 -16
- package/dist/src/parser/expr-stmt-parser.js.map +1 -1
- package/dist/src/parser/type-parser.d.ts.map +1 -1
- package/dist/src/parser/type-parser.js +42 -0
- package/dist/src/parser/type-parser.js.map +1 -1
- package/dist/src/parser.d.ts.map +1 -1
- package/dist/src/parser.js +6 -1
- package/dist/src/parser.js.map +1 -1
- package/dist/src/typecheck/diagnostics.d.ts +10 -0
- package/dist/src/typecheck/diagnostics.d.ts.map +1 -1
- package/dist/src/typecheck/diagnostics.js +27 -0
- package/dist/src/typecheck/diagnostics.js.map +1 -1
- package/dist/src/typecheck/expression.d.ts.map +1 -1
- package/dist/src/typecheck/expression.js +13 -0
- package/dist/src/typecheck/expression.js.map +1 -1
- package/dist/src/typecheck/generics.d.ts +5 -0
- package/dist/src/typecheck/generics.d.ts.map +1 -1
- package/dist/src/typecheck/generics.js +15 -8
- package/dist/src/typecheck/generics.js.map +1 -1
- package/dist/src/types.d.ts +59 -13
- package/dist/src/types.d.ts.map +1 -1
- package/dist/src/types.js.map +1 -1
- package/dist/src/version.d.ts +18 -0
- package/dist/src/version.d.ts.map +1 -0
- package/dist/src/version.js +18 -0
- package/dist/src/version.js.map +1 -0
- package/dist/test/integration/builtin-enum-vocabulary.test.d.ts +2 -0
- package/dist/test/integration/builtin-enum-vocabulary.test.d.ts.map +1 -0
- package/dist/test/integration/builtin-enum-vocabulary.test.js +51 -0
- package/dist/test/integration/builtin-enum-vocabulary.test.js.map +1 -0
- package/dist/test/integration/lsp/lsp-rename-safety.test.js +0 -13
- package/dist/test/integration/lsp/lsp-rename-safety.test.js.map +1 -1
- package/dist/test/integration/name-resolution-entrypoints.test.d.ts +2 -0
- package/dist/test/integration/name-resolution-entrypoints.test.d.ts.map +1 -0
- package/dist/test/integration/name-resolution-entrypoints.test.js +109 -0
- package/dist/test/integration/name-resolution-entrypoints.test.js.map +1 -0
- package/dist/test/integration/scripts/typecheck-cli-repl.test.d.ts +2 -0
- package/dist/test/integration/scripts/typecheck-cli-repl.test.d.ts.map +1 -0
- package/dist/test/integration/scripts/typecheck-cli-repl.test.js +133 -0
- package/dist/test/integration/scripts/typecheck-cli-repl.test.js.map +1 -0
- package/dist/test/integration/vocabulary-resolution.test.d.ts +2 -0
- package/dist/test/integration/vocabulary-resolution.test.d.ts.map +1 -0
- package/dist/test/integration/vocabulary-resolution.test.js +291 -0
- package/dist/test/integration/vocabulary-resolution.test.js.map +1 -0
- package/dist/test/property/property.test.js +2 -1
- package/dist/test/property/property.test.js.map +1 -1
- package/dist/test/unit/canonicalizer/canonicalizer.test.js +7 -79
- package/dist/test/unit/canonicalizer/canonicalizer.test.js.map +1 -1
- package/dist/test/unit/config/lexicons/identifiers/identifier-mapping.test.js +134 -31
- package/dist/test/unit/config/lexicons/identifiers/identifier-mapping.test.js.map +1 -1
- package/dist/test/unit/config/lexicons/identifiers/literal-macro.test.js +16 -18
- package/dist/test/unit/config/lexicons/identifiers/literal-macro.test.js.map +1 -1
- package/dist/test/unit/core/resolve-typed-references.test.d.ts +2 -0
- package/dist/test/unit/core/resolve-typed-references.test.d.ts.map +1 -0
- package/dist/test/unit/core/resolve-typed-references.test.js +600 -0
- package/dist/test/unit/core/resolve-typed-references.test.js.map +1 -0
- package/dist/test/unit/diagnostics/diagnostic-overlays.test.d.ts +2 -0
- package/dist/test/unit/diagnostics/diagnostic-overlays.test.d.ts.map +1 -0
- package/dist/test/unit/diagnostics/diagnostic-overlays.test.js +156 -0
- package/dist/test/unit/diagnostics/diagnostic-overlays.test.js.map +1 -0
- package/dist/test/unit/diagnostics/resolution-codes.test.d.ts +6 -0
- package/dist/test/unit/diagnostics/resolution-codes.test.d.ts.map +1 -0
- package/dist/test/unit/diagnostics/resolution-codes.test.js +96 -0
- package/dist/test/unit/diagnostics/resolution-codes.test.js.map +1 -0
- package/dist/test/unit/formatter-corpus-roundtrip.test.js +5 -0
- package/dist/test/unit/formatter-corpus-roundtrip.test.js.map +1 -1
- package/dist/test/unit/formatter-roundtrip.test.js +84 -0
- package/dist/test/unit/formatter-roundtrip.test.js.map +1 -1
- package/dist/test/unit/frontend/resolve-declarations.test.d.ts +2 -0
- package/dist/test/unit/frontend/resolve-declarations.test.d.ts.map +1 -0
- package/dist/test/unit/frontend/resolve-declarations.test.js +459 -0
- package/dist/test/unit/frontend/resolve-declarations.test.js.map +1 -0
- package/dist/test/unit/identifiers/casefold.test.d.ts +2 -0
- package/dist/test/unit/identifiers/casefold.test.d.ts.map +1 -0
- package/dist/test/unit/identifiers/casefold.test.js +77 -0
- package/dist/test/unit/identifiers/casefold.test.js.map +1 -0
- package/dist/test/unit/identifiers/scopes.test.d.ts +2 -0
- package/dist/test/unit/identifiers/scopes.test.d.ts.map +1 -0
- package/dist/test/unit/identifiers/scopes.test.js +109 -0
- package/dist/test/unit/identifiers/scopes.test.js.map +1 -0
- package/dist/test/unit/lambda-capture-parity.test.js +12 -5
- package/dist/test/unit/lambda-capture-parity.test.js.map +1 -1
- package/dist/test/unit/lsp/lsp-locale-fixes.test.js +10 -11
- package/dist/test/unit/lsp/lsp-locale-fixes.test.js.map +1 -1
- package/dist/test/unit/lsp/parse-document.test.js +42 -0
- package/dist/test/unit/lsp/parse-document.test.js.map +1 -1
- package/dist/test/unit/lsp/resolution-completion.test.d.ts +2 -0
- package/dist/test/unit/lsp/resolution-completion.test.d.ts.map +1 -0
- package/dist/test/unit/lsp/resolution-completion.test.js +132 -0
- package/dist/test/unit/lsp/resolution-completion.test.js.map +1 -0
- package/dist/test/unit/lsp/resolution-definition.test.d.ts +2 -0
- package/dist/test/unit/lsp/resolution-definition.test.d.ts.map +1 -0
- package/dist/test/unit/lsp/resolution-definition.test.js +75 -0
- package/dist/test/unit/lsp/resolution-definition.test.js.map +1 -0
- package/dist/test/unit/lsp/resolution-diagnostics.test.d.ts +2 -0
- package/dist/test/unit/lsp/resolution-diagnostics.test.d.ts.map +1 -0
- package/dist/test/unit/lsp/resolution-diagnostics.test.js +88 -0
- package/dist/test/unit/lsp/resolution-diagnostics.test.js.map +1 -0
- package/dist/test/unit/lsp/resolution-fixture.d.ts +32 -0
- package/dist/test/unit/lsp/resolution-fixture.d.ts.map +1 -0
- package/dist/test/unit/lsp/resolution-fixture.js +69 -0
- package/dist/test/unit/lsp/resolution-fixture.js.map +1 -0
- package/dist/test/unit/lsp/resolution-hover.test.d.ts +2 -0
- package/dist/test/unit/lsp/resolution-hover.test.d.ts.map +1 -0
- package/dist/test/unit/lsp/resolution-hover.test.js +107 -0
- package/dist/test/unit/lsp/resolution-hover.test.js.map +1 -0
- package/dist/test/unit/lsp/tenant-vocabulary.test.js +21 -47
- package/dist/test/unit/lsp/tenant-vocabulary.test.js.map +1 -1
- package/dist/test/unit/parser/func-type.test.d.ts +2 -0
- package/dist/test/unit/parser/func-type.test.d.ts.map +1 -0
- package/dist/test/unit/parser/func-type.test.js +161 -0
- package/dist/test/unit/parser/func-type.test.js.map +1 -0
- package/dist/test/unit/parser/parser.test.js +33 -0
- package/dist/test/unit/parser/parser.test.js.map +1 -1
- package/dist/test/unit/public-api-checked-entries.test.d.ts +2 -0
- package/dist/test/unit/public-api-checked-entries.test.d.ts.map +1 -0
- package/dist/test/unit/public-api-checked-entries.test.js +28 -0
- package/dist/test/unit/public-api-checked-entries.test.js.map +1 -0
- package/dist/test/unit/typecheck/qualified-enum-member.test.d.ts +2 -0
- package/dist/test/unit/typecheck/qualified-enum-member.test.d.ts.map +1 -0
- package/dist/test/unit/typecheck/qualified-enum-member.test.js +73 -0
- package/dist/test/unit/typecheck/qualified-enum-member.test.js.map +1 -0
- package/dist/test/unit/version.test.d.ts +9 -0
- package/dist/test/unit/version.test.d.ts.map +1 -0
- package/dist/test/unit/version.test.js +34 -0
- package/dist/test/unit/version.test.js.map +1 -0
- package/package.json +2 -1
- package/dist/src/config/lexicons/identifiers/examples/canonicalizer-integration.d.ts +0 -47
- package/dist/src/config/lexicons/identifiers/examples/canonicalizer-integration.d.ts.map +0 -1
- package/dist/src/config/lexicons/identifiers/examples/canonicalizer-integration.js +0 -142
- package/dist/src/config/lexicons/identifiers/examples/canonicalizer-integration.js.map +0 -1
|
@@ -10,6 +10,47 @@ import { buildTokenIndex, tokenNameAt as tokenNameAtOptimized } from '../token-i
|
|
|
10
10
|
import { funcDetail, findDeclAt, findPatternBindingDetail, findLocalLetWithExpr, } from './shared.js';
|
|
11
11
|
import { isAstFunc, isAstData, isAstEnum, } from '../type-guards.js';
|
|
12
12
|
import { getLspUiTexts } from '../../config/lexicons/lsp-ui-texts.js';
|
|
13
|
+
import { resolveDocument, siteAt } from '../resolution.js';
|
|
14
|
+
function roleLabel(role, ui) {
|
|
15
|
+
switch (role) {
|
|
16
|
+
case 'TYPE_DECL':
|
|
17
|
+
case 'TYPE':
|
|
18
|
+
return ui.resolutionRoleType;
|
|
19
|
+
case 'FIELD_DECL':
|
|
20
|
+
case 'FIELD_REF':
|
|
21
|
+
return ui.resolutionRoleField;
|
|
22
|
+
case 'MEMBER_DECL':
|
|
23
|
+
case 'MEMBER_REF':
|
|
24
|
+
return ui.resolutionRoleMember;
|
|
25
|
+
case 'FUNC_DECL':
|
|
26
|
+
case 'FUNC_REF':
|
|
27
|
+
return ui.resolutionRoleFunction;
|
|
28
|
+
default:
|
|
29
|
+
return undefined;
|
|
30
|
+
}
|
|
31
|
+
}
|
|
32
|
+
/** `写法 → 规范名(角色 · 父名)`;写法等于规范名或角色为局部名时不显示。 */
|
|
33
|
+
export function formatResolution(site, ui) {
|
|
34
|
+
const label = roleLabel(site.role, ui);
|
|
35
|
+
if (!label || site.written === site.canonical)
|
|
36
|
+
return null;
|
|
37
|
+
const detail = site.parent ? `${label} · ${site.parent}` : label;
|
|
38
|
+
return `${site.written} → ${site.canonical}${ui.resolutionOpen}${detail}${ui.resolutionClose}`;
|
|
39
|
+
}
|
|
40
|
+
/** 光标处名字的解析行;语法不完整时只有 R1 位置(R2 已跳过)。 */
|
|
41
|
+
function resolutionLineAt(entry, pos, word, ui) {
|
|
42
|
+
if (!word)
|
|
43
|
+
return null;
|
|
44
|
+
const site = siteAt(resolveDocument(entry), pos, word);
|
|
45
|
+
return site ? formatResolution(site, ui) : null;
|
|
46
|
+
}
|
|
47
|
+
/** 解析行置于原有悬停内容之前;二者皆无时不悬停。 */
|
|
48
|
+
function withResolutionLine(base, line) {
|
|
49
|
+
if (!line)
|
|
50
|
+
return base;
|
|
51
|
+
const value = base ? `${line}\n\n${base.contents.value}` : line;
|
|
52
|
+
return { contents: { kind: 'markdown', value } };
|
|
53
|
+
}
|
|
13
54
|
/**
|
|
14
55
|
* 注册 Hover 处理器
|
|
15
56
|
* @param connection LSP 连接对象
|
|
@@ -22,102 +63,107 @@ export function registerHoverHandler(connection, documents, getOrParse, getLexic
|
|
|
22
63
|
if (!doc)
|
|
23
64
|
return null;
|
|
24
65
|
const entry = getOrParse(doc);
|
|
25
|
-
const
|
|
26
|
-
const
|
|
27
|
-
|
|
28
|
-
const
|
|
29
|
-
|
|
30
|
-
|
|
31
|
-
|
|
32
|
-
|
|
33
|
-
|
|
34
|
-
|
|
35
|
-
|
|
36
|
-
|
|
37
|
-
|
|
38
|
-
|
|
39
|
-
|
|
40
|
-
|
|
41
|
-
|
|
42
|
-
|
|
43
|
-
|
|
44
|
-
|
|
45
|
-
|
|
46
|
-
|
|
47
|
-
|
|
48
|
-
|
|
49
|
-
|
|
50
|
-
|
|
51
|
-
|
|
52
|
-
|
|
53
|
-
|
|
54
|
-
|
|
55
|
-
|
|
56
|
-
|
|
57
|
-
|
|
58
|
-
|
|
59
|
-
|
|
60
|
-
|
|
66
|
+
const tokenIndex = buildTokenIndex(entry.tokens);
|
|
67
|
+
const ui = getLspUiTexts(getLexiconForDoc?.(params.textDocument.uri));
|
|
68
|
+
const base = baseHover(entry, tokenIndex, params.position, params.textDocument.uri, getLexiconForDoc);
|
|
69
|
+
const line = resolutionLineAt(entry, params.position, tokenNameAtOptimized(tokenIndex, params.position), ui);
|
|
70
|
+
return withResolutionLine(base, line);
|
|
71
|
+
});
|
|
72
|
+
}
|
|
73
|
+
/** 原有悬停:互操作调用、声明 / 参数 / 局部名 / 模式绑定。 */
|
|
74
|
+
function baseHover(entry, tokenIndex, pos, uri, getLexiconForDoc) {
|
|
75
|
+
const { tokens: toks, ast } = entry;
|
|
76
|
+
const anyCall = findDottedCallRangeAt(toks, pos);
|
|
77
|
+
if (anyCall) {
|
|
78
|
+
// Include a short signature preview by heuristic
|
|
79
|
+
const info = describeDottedCallAt(toks, pos);
|
|
80
|
+
const sig = info ? `${info.name}(${info.argDescs.join(', ')})` : 'interop(...)';
|
|
81
|
+
const diags = findAmbiguousInteropCalls(toks);
|
|
82
|
+
const amb = diags.find(d => d.range.start.line <= pos.line &&
|
|
83
|
+
d.range.end.line >= pos.line &&
|
|
84
|
+
d.range.start.character <= pos.character &&
|
|
85
|
+
d.range.end.character >= pos.character);
|
|
86
|
+
const header = amb ? 'Ambiguous interop call' : 'Interop call';
|
|
87
|
+
const body = amb
|
|
88
|
+
? 'Use `1L` or `1.0` to disambiguate; a Quick Fix is available.'
|
|
89
|
+
: 'Overload selection uses primitive widening/boxing; use `1L` or `1.0` to make intent explicit.';
|
|
90
|
+
const desc = info ? buildDescriptorPreview(info.name, info.argDescs) : null;
|
|
91
|
+
const retText = returnTypeTextFromDesc(desc);
|
|
92
|
+
const extra = desc ? `\nDescriptor: \`${desc}\`` : '';
|
|
93
|
+
const retLine = retText ? `\nReturns: **${retText}**` : '';
|
|
94
|
+
const msg = `**${header}** — [Guide → JVM Interop Overloads](/guide/interop-overloads)\n\nPreview: \`${sig}\`${extra}${retLine}\n\n${body}`;
|
|
95
|
+
return { contents: { kind: 'markdown', value: msg } };
|
|
96
|
+
}
|
|
97
|
+
// Semantic hover: decls/params/locals/types using AST spans and tokens
|
|
98
|
+
try {
|
|
99
|
+
const lexicon = getLexiconForDoc?.(uri);
|
|
100
|
+
const ui = getLspUiTexts(lexicon);
|
|
101
|
+
const ast2 = ast || parse(toks).ast;
|
|
102
|
+
const describeDecl = (d) => {
|
|
103
|
+
if (isAstFunc(d))
|
|
104
|
+
return `${ui.functionLabel} ${d.name} — ${funcDetail(d)}`;
|
|
105
|
+
if (isAstData(d)) {
|
|
106
|
+
const fields = d.fields.map(f => `**${f.name}**: ${typeText(f.type)}`).join(', ');
|
|
107
|
+
return `${ui.typeLabel} ${d.name}${fields ? ' — ' + fields : ''}`;
|
|
108
|
+
}
|
|
109
|
+
if (isAstEnum(d))
|
|
110
|
+
return `${ui.enumLabel} ${d.name} — ${d.variants.join(', ')}`;
|
|
111
|
+
return null;
|
|
112
|
+
};
|
|
113
|
+
/* ★光标上的名字若是顶层函数/类型/枚举,描述**那个**声明——与跳转定义同一套解析。
|
|
114
|
+
* 旧实现只查参数/局部/模式绑定,其余一律落到外层函数:`Return twice(twice(x)).`
|
|
115
|
+
* 里两个 twice 都显示「函数 quad」。 */
|
|
116
|
+
const topLevelByName = (name) => {
|
|
117
|
+
if (!name)
|
|
118
|
+
return undefined;
|
|
119
|
+
return ast2.decls.find(d => (isAstFunc(d) || isAstData(d) || isAstEnum(d)) && d.name === name);
|
|
120
|
+
};
|
|
121
|
+
const decl = findDeclAt(ast2, pos);
|
|
122
|
+
if (decl) {
|
|
123
|
+
if (isAstFunc(decl)) {
|
|
124
|
+
const f = decl;
|
|
125
|
+
// Use optimized O(log n) token lookup
|
|
126
|
+
const nameAt = tokenNameAtOptimized(tokenIndex, pos);
|
|
127
|
+
// Pattern bindings: if hover is inside a case body and name matches a binding
|
|
128
|
+
const patInfo = nameAt ? findPatternBindingDetail(f, nameAt, pos) : null;
|
|
129
|
+
if (patInfo) {
|
|
130
|
+
const ofTxt = patInfo.ofType ? ` of ${patInfo.ofType}` : '';
|
|
131
|
+
return { contents: { kind: 'markdown', value: `${ui.patternBindingLabel} ${patInfo.name}${ofTxt}` } };
|
|
61
132
|
}
|
|
62
|
-
if (
|
|
63
|
-
|
|
64
|
-
|
|
65
|
-
|
|
66
|
-
|
|
67
|
-
|
|
68
|
-
* 里两个 twice 都显示「函数 quad」。 */
|
|
69
|
-
const topLevelByName = (name) => {
|
|
70
|
-
if (!name)
|
|
71
|
-
return undefined;
|
|
72
|
-
return ast2.decls.find(d => (isAstFunc(d) || isAstData(d) || isAstEnum(d)) && d.name === name);
|
|
73
|
-
};
|
|
74
|
-
const decl = findDeclAt(ast2, pos);
|
|
75
|
-
if (decl) {
|
|
76
|
-
if (isAstFunc(decl)) {
|
|
77
|
-
const f = decl;
|
|
78
|
-
// Use optimized O(log n) token lookup
|
|
79
|
-
const nameAt = tokenNameAtOptimized(tokenIndex, pos);
|
|
80
|
-
// Pattern bindings: if hover is inside a case body and name matches a binding
|
|
81
|
-
const patInfo = nameAt ? findPatternBindingDetail(f, nameAt, pos) : null;
|
|
82
|
-
if (patInfo) {
|
|
83
|
-
const ofTxt = patInfo.ofType ? ` of ${patInfo.ofType}` : '';
|
|
84
|
-
return { contents: { kind: 'markdown', value: `${ui.patternBindingLabel} ${patInfo.name}${ofTxt}` } };
|
|
133
|
+
if (nameAt) {
|
|
134
|
+
const param = f.params.find(p => p.name === nameAt);
|
|
135
|
+
if (param) {
|
|
136
|
+
const piiHint = buildPiiComplianceHint(param, lexicon);
|
|
137
|
+
const baseInfo = `${ui.parameterLabel} **${param.name}**: ${typeText(param.type)}`;
|
|
138
|
+
return { contents: { kind: 'markdown', value: piiHint ? `${baseInfo}\n\n${piiHint}` : baseInfo } };
|
|
85
139
|
}
|
|
86
|
-
|
|
87
|
-
|
|
88
|
-
|
|
89
|
-
|
|
90
|
-
const baseInfo = `${ui.parameterLabel} **${param.name}**: ${typeText(param.type)}`;
|
|
91
|
-
return { contents: { kind: 'markdown', value: piiHint ? `${baseInfo}\n\n${piiHint}` : baseInfo } };
|
|
92
|
-
}
|
|
93
|
-
const localInfo = findLocalLetWithExpr(f.body, nameAt);
|
|
94
|
-
if (localInfo) {
|
|
95
|
-
const hint = exprTypeText(localInfo.expr);
|
|
96
|
-
return { contents: { kind: 'markdown', value: `${ui.localLabel} ${nameAt}${hint ? ': ' + hint : ''}` } };
|
|
97
|
-
}
|
|
98
|
-
const named = topLevelByName(nameAt);
|
|
99
|
-
const namedText = named ? describeDecl(named) : null;
|
|
100
|
-
if (namedText)
|
|
101
|
-
return { contents: { kind: 'markdown', value: namedText } };
|
|
140
|
+
const localInfo = findLocalLetWithExpr(f.body, nameAt);
|
|
141
|
+
if (localInfo) {
|
|
142
|
+
const hint = exprTypeText(localInfo.expr);
|
|
143
|
+
return { contents: { kind: 'markdown', value: `${ui.localLabel} ${nameAt}${hint ? ': ' + hint : ''}` } };
|
|
102
144
|
}
|
|
103
|
-
|
|
104
|
-
|
|
105
|
-
|
|
106
|
-
|
|
107
|
-
const fields = d.fields.map(f => `**${f.name}**: ${typeText(f.type)}`).join(', ');
|
|
108
|
-
return { contents: { kind: 'markdown', value: `${ui.typeLabel} ${d.name}${fields ? ' — ' + fields : ''}` } };
|
|
109
|
-
}
|
|
110
|
-
if (isAstEnum(decl)) {
|
|
111
|
-
const e = decl;
|
|
112
|
-
return { contents: { kind: 'markdown', value: `${ui.enumLabel} ${e.name} — ${e.variants.join(', ')}` } };
|
|
145
|
+
const named = topLevelByName(nameAt);
|
|
146
|
+
const namedText = named ? describeDecl(named) : null;
|
|
147
|
+
if (namedText)
|
|
148
|
+
return { contents: { kind: 'markdown', value: namedText } };
|
|
113
149
|
}
|
|
150
|
+
return { contents: { kind: 'markdown', value: `${ui.functionLabel} ${f.name} — ${funcDetail(f)}` } };
|
|
151
|
+
}
|
|
152
|
+
if (isAstData(decl)) {
|
|
153
|
+
const d = decl;
|
|
154
|
+
const fields = d.fields.map(f => `**${f.name}**: ${typeText(f.type)}`).join(', ');
|
|
155
|
+
return { contents: { kind: 'markdown', value: `${ui.typeLabel} ${d.name}${fields ? ' — ' + fields : ''}` } };
|
|
156
|
+
}
|
|
157
|
+
if (isAstEnum(decl)) {
|
|
158
|
+
const e = decl;
|
|
159
|
+
return { contents: { kind: 'markdown', value: `${ui.enumLabel} ${e.name} — ${e.variants.join(', ')}` } };
|
|
114
160
|
}
|
|
115
161
|
}
|
|
116
|
-
|
|
117
|
-
|
|
118
|
-
|
|
119
|
-
|
|
120
|
-
|
|
162
|
+
}
|
|
163
|
+
catch {
|
|
164
|
+
// ignore
|
|
165
|
+
}
|
|
166
|
+
return null;
|
|
121
167
|
}
|
|
122
168
|
/**
|
|
123
169
|
* 为 PII 参数构建合规提示信息
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"hover.js","sourceRoot":"","sources":["../../../../src/lsp/navigation/hover.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAIH,OAAO,EAAE,QAAQ,EAAE,MAAM,kBAAkB,CAAC;AAC5C,OAAO,EACL,qBAAqB,EACrB,oBAAoB,EACpB,yBAAyB,EACzB,sBAAsB,EACtB,sBAAsB,GACvB,MAAM,gBAAgB,CAAC;AACxB,OAAO,EAAE,YAAY,EAAE,MAAM,aAAa,CAAC;AAC3C,OAAO,EAAE,KAAK,EAAE,MAAM,iBAAiB,CAAC;AACxC,OAAO,EAAE,eAAe,EAAE,WAAW,IAAI,oBAAoB,EAAE,MAAM,mBAAmB,CAAC;AACzF,OAAO,EACL,UAAU,EACV,UAAU,EACV,wBAAwB,EACxB,oBAAoB,GACrB,MAAM,aAAa,CAAC;AACrB,OAAO,EACL,SAAS,EACT,SAAS,EACT,SAAS,GACV,MAAM,mBAAmB,CAAC;AAM3B,OAAO,EAAE,aAAa,EAAE,MAAM,uCAAuC,CAAC;AAEtE;;;;;GAKG;AACH,MAAM,UAAU,oBAAoB,CAClC,UAAsB,EACtB,SAAyD,EACzD,
|
|
1
|
+
{"version":3,"file":"hover.js","sourceRoot":"","sources":["../../../../src/lsp/navigation/hover.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,11 +1,14 @@
|
|
|
1
1
|
import type { Module as AstModule } from '../types.js';
|
|
2
|
-
import type
|
|
2
|
+
import { type Diagnostic } from '../diagnostics/diagnostics.js';
|
|
3
3
|
import type { Lexicon } from '../config/lexicons/types.js';
|
|
4
|
+
import type { VocabularyScopes } from '../config/lexicons/identifiers/scopes.js';
|
|
4
5
|
export interface ParsedDocument {
|
|
5
6
|
readonly can: string;
|
|
6
7
|
readonly tokens: readonly any[];
|
|
7
8
|
readonly ast: AstModule | null;
|
|
8
9
|
readonly parseDiagnostics: readonly Diagnostic[];
|
|
10
|
+
/** 本文档使用的租户词汇作用域(名称解析 R1/R2 用);无租户词汇时缺省 */
|
|
11
|
+
readonly vocabulary?: VocabularyScopes;
|
|
9
12
|
}
|
|
10
13
|
export declare function parseDocumentText(text: string, lexicon: Lexicon | undefined, tenantId: string | undefined, domain: string | undefined): ParsedDocument;
|
|
11
14
|
//# sourceMappingURL=parse-document.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"parse-document.d.ts","sourceRoot":"","sources":["../../../src/lsp/parse-document.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"parse-document.d.ts","sourceRoot":"","sources":["../../../src/lsp/parse-document.ts"],"names":[],"mappings":"AAoBA,OAAO,KAAK,EAAE,MAAM,IAAI,SAAS,EAAE,MAAM,aAAa,CAAC;AACvD,OAAO,EAAmB,KAAK,UAAU,EAAE,MAAM,+BAA+B,CAAC;AACjF,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,6BAA6B,CAAC;AAG3D,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,0CAA0C,CAAC;AAEjF,MAAM,WAAW,cAAc;IAC7B,QAAQ,CAAC,GAAG,EAAE,MAAM,CAAC;IACrB,QAAQ,CAAC,MAAM,EAAE,SAAS,GAAG,EAAE,CAAC;IAChC,QAAQ,CAAC,GAAG,EAAE,SAAS,GAAG,IAAI,CAAC;IAC/B,QAAQ,CAAC,gBAAgB,EAAE,SAAS,UAAU,EAAE,CAAC;IACjD,2CAA2C;IAC3C,QAAQ,CAAC,UAAU,CAAC,EAAE,gBAAgB,CAAC;CACxC;AAED,wBAAgB,iBAAiB,CAC/B,IAAI,EAAE,MAAM,EACZ,OAAO,EAAE,OAAO,GAAG,SAAS,EAC5B,QAAQ,EAAE,MAAM,GAAG,SAAS,EAC5B,MAAM,EAAE,MAAM,GAAG,SAAS,GACzB,cAAc,CA0BhB"}
|
|
@@ -8,32 +8,35 @@
|
|
|
8
8
|
* 浏览器侧编译(browser.ts)与 formatter 一直是 `lex(canonical, lexicon)`,此处对齐。
|
|
9
9
|
*
|
|
10
10
|
* 返回的 tokens 与 ast 的位置均为**原文**坐标(`can` 仅供需要规范化文本的调用方)。
|
|
11
|
+
*
|
|
12
|
+
* ★词法错误(未闭合字符串、非法字符、缩进错误)不抛出:返回 `tokens: []`、`ast: null`,
|
|
13
|
+
* 把词法诊断放进 parseDiagnostics,由诊断路径照常发布。抛出会让 getOrParse 失败,
|
|
14
|
+
* pull 诊断整体 reject 后返回空列表——用户正在输入字符串时反而看到「无问题」。
|
|
15
|
+
* 规范化保持行数不变,词法诊断的行号即原文行号。
|
|
11
16
|
*/
|
|
12
17
|
import { canonicalize } from '../frontend/canonicalizer.js';
|
|
13
18
|
import { lex } from '../frontend/lexer.js';
|
|
14
19
|
import { parse, parseWithLexicon } from '../parser.js';
|
|
15
20
|
import { needsKeywordTranslation } from '../frontend/keyword-translator.js';
|
|
21
|
+
import { DiagnosticError } from '../diagnostics/diagnostics.js';
|
|
16
22
|
import { buildCanonicalizeOptions } from './canonicalize-options.js';
|
|
17
23
|
import { alignTokensToSource } from './source-positions.js';
|
|
18
|
-
import { vocabularyRegistry, initBuiltinVocabularies } from '../config/lexicons/identifiers/registry.js';
|
|
19
|
-
/**
|
|
20
|
-
* 领域词汇的「规范名 → 本地化写法」查找:canonicalize 用同一份词汇把本地化词替换成规范名,
|
|
21
|
-
* 对齐时据此在原文里找回本地化写法(否则该 token 及其后同一行的位置全部推算错位)。
|
|
22
|
-
*/
|
|
23
|
-
function localizedLookup(lexicon, tenantId, domain) {
|
|
24
|
-
if (!lexicon || !tenantId || !domain)
|
|
25
|
-
return undefined;
|
|
26
|
-
initBuiltinVocabularies();
|
|
27
|
-
const index = vocabularyRegistry.getWithCustom(tenantId, domain, lexicon.id)?.index;
|
|
28
|
-
if (!index)
|
|
29
|
-
return undefined;
|
|
30
|
-
return (canonical) => index.toLocalized.get(canonical) ?? index.toLocalized.get(canonical.toLowerCase());
|
|
31
|
-
}
|
|
32
24
|
export function parseDocumentText(text, lexicon, tenantId, domain) {
|
|
33
|
-
const
|
|
25
|
+
const options = buildCanonicalizeOptions(lexicon, tenantId, domain);
|
|
26
|
+
const vocabulary = options && 'vocabulary' in options ? options.vocabulary : undefined;
|
|
27
|
+
const can = canonicalize(text, options);
|
|
34
28
|
// ★token 位置改为原文坐标后再解析:AST span 由 token 派生,于是高亮/跳转/hover/重命名/
|
|
35
29
|
// 诊断的位置都对应原文(canonicalize 删冠词等会改变行内长度,见 source-positions.ts)。
|
|
36
|
-
|
|
30
|
+
let tokens;
|
|
31
|
+
try {
|
|
32
|
+
tokens = alignTokensToSource(text, can, lex(can, lexicon));
|
|
33
|
+
}
|
|
34
|
+
catch (error) {
|
|
35
|
+
if (!(error instanceof DiagnosticError))
|
|
36
|
+
throw error;
|
|
37
|
+
const lexFailed = { can, tokens: [], ast: null, parseDiagnostics: [error.diagnostic] };
|
|
38
|
+
return vocabulary ? { ...lexFailed, vocabulary } : lexFailed;
|
|
39
|
+
}
|
|
37
40
|
let ast;
|
|
38
41
|
let parseDiagnostics = [];
|
|
39
42
|
try {
|
|
@@ -46,6 +49,6 @@ export function parseDocumentText(text, lexicon, tenantId, domain) {
|
|
|
46
49
|
catch {
|
|
47
50
|
ast = null;
|
|
48
51
|
}
|
|
49
|
-
return { can, tokens, ast, parseDiagnostics };
|
|
52
|
+
return vocabulary ? { can, tokens, ast, parseDiagnostics, vocabulary } : { can, tokens, ast, parseDiagnostics };
|
|
50
53
|
}
|
|
51
54
|
//# sourceMappingURL=parse-document.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"parse-document.js","sourceRoot":"","sources":["../../../src/lsp/parse-document.ts"],"names":[],"mappings":"AAAA
|
|
1
|
+
{"version":3,"file":"parse-document.js","sourceRoot":"","sources":["../../../src/lsp/parse-document.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;GAeG;AACH,OAAO,EAAE,YAAY,EAAE,MAAM,8BAA8B,CAAC;AAC5D,OAAO,EAAE,GAAG,EAAE,MAAM,sBAAsB,CAAC;AAC3C,OAAO,EAAE,KAAK,EAAE,gBAAgB,EAAE,MAAM,cAAc,CAAC;AACvD,OAAO,EAAE,uBAAuB,EAAE,MAAM,mCAAmC,CAAC;AAE5E,OAAO,EAAE,eAAe,EAAmB,MAAM,+BAA+B,CAAC;AAEjF,OAAO,EAAE,wBAAwB,EAAE,MAAM,2BAA2B,CAAC;AACrE,OAAO,EAAE,mBAAmB,EAAE,MAAM,uBAAuB,CAAC;AAY5D,MAAM,UAAU,iBAAiB,CAC/B,IAAY,EACZ,OAA4B,EAC5B,QAA4B,EAC5B,MAA0B;IAE1B,MAAM,OAAO,GAAG,wBAAwB,CAAC,OAAO,EAAE,QAAQ,EAAE,MAAM,CAAC,CAAC;IACpE,MAAM,UAAU,GAAG,OAAO,IAAI,YAAY,IAAI,OAAO,CAAC,CAAC,CAAC,OAAO,CAAC,UAAU,CAAC,CAAC,CAAC,SAAS,CAAC;IACvF,MAAM,GAAG,GAAG,YAAY,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;IACxC,6DAA6D;IAC7D,gEAAgE;IAChE,IAAI,MAAsB,CAAC;IAC3B,IAAI,CAAC;QACH,MAAM,GAAG,mBAAmB,CAAC,IAAI,EAAE,GAAG,EAAE,GAAG,CAAC,GAAG,EAAE,OAAO,CAAC,CAAC,CAAC;IAC7D,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACf,IAAI,CAAC,CAAC,KAAK,YAAY,eAAe,CAAC;YAAE,MAAM,KAAK,CAAC;QACrD,MAAM,SAAS,GAAG,EAAE,GAAG,EAAE,MAAM,EAAE,EAAE,EAAE,GAAG,EAAE,IAAI,EAAE,gBAAgB,EAAE,CAAC,KAAK,CAAC,UAAU,CAAC,EAAE,CAAC;QACvF,OAAO,UAAU,CAAC,CAAC,CAAC,EAAE,GAAG,SAAS,EAAE,UAAU,EAAE,CAAC,CAAC,CAAC,SAAS,CAAC;IAC/D,CAAC;IACD,IAAI,GAAqB,CAAC;IAC1B,IAAI,gBAAgB,GAA0B,EAAE,CAAC;IACjD,IAAI,CAAC;QACH,MAAM,MAAM,GAAG,OAAO,IAAI,uBAAuB,CAAC,OAAO,CAAC;YACxD,CAAC,CAAC,gBAAgB,CAAC,MAAM,EAAE,OAAO,CAAC;YACnC,CAAC,CAAC,KAAK,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;QAC3B,GAAG,GAAG,MAAM,CAAC,GAAgB,CAAC;QAC9B,gBAAgB,GAAG,MAAM,CAAC,WAAW,CAAC;IACxC,CAAC;IAAC,MAAM,CAAC;QACP,GAAG,GAAG,IAAI,CAAC;IACb,CAAC;IACD,OAAO,UAAU,CAAC,CAAC,CAAC,EAAE,GAAG,EAAE,MAAM,EAAE,GAAG,EAAE,gBAAgB,EAAE,UAAU,EAAE,CAAC,CAAC,CAAC,EAAE,GAAG,EAAE,MAAM,EAAE,GAAG,EAAE,gBAAgB,EAAE,CAAC;AAClH,CAAC"}
|
|
@@ -0,0 +1,40 @@
|
|
|
1
|
+
import type { VocabularyScopes } from '../config/lexicons/identifiers/scopes.js';
|
|
2
|
+
import type { Core, Module as AstModule, ResolvedRole, Span, TypecheckDiagnostic } from '../types.js';
|
|
3
|
+
/** 一个按角色解析的写法及其源码位置。 */
|
|
4
|
+
export interface ResolutionSite {
|
|
5
|
+
readonly span: Span;
|
|
6
|
+
readonly written: string;
|
|
7
|
+
readonly canonical: string;
|
|
8
|
+
readonly role: ResolvedRole;
|
|
9
|
+
/** 字段 / 枚举成员所属的规范父名;未知时缺省 */
|
|
10
|
+
readonly parent?: string;
|
|
11
|
+
}
|
|
12
|
+
/** 值位置名字(含点分路径)与其 §4 静态类型。 */
|
|
13
|
+
export interface TypedName {
|
|
14
|
+
readonly span: Span;
|
|
15
|
+
readonly type: Core.Type;
|
|
16
|
+
}
|
|
17
|
+
export interface DocumentResolution {
|
|
18
|
+
/** 是否运行了 R2(语法完整) */
|
|
19
|
+
readonly complete: boolean;
|
|
20
|
+
readonly sites: readonly ResolutionSite[];
|
|
21
|
+
readonly typedNames: readonly TypedName[];
|
|
22
|
+
/** 可做语义检查的 Core:语法完整时为 R2 输出;语法不完整时仅在无词汇且 R1 无 error 时为 R1 的 lower 结果 */
|
|
23
|
+
readonly core?: Core.Module;
|
|
24
|
+
readonly diagnostics: readonly TypecheckDiagnostic[];
|
|
25
|
+
}
|
|
26
|
+
/** 解析所需的文档快照(server 的 CachedDoc 满足此形状)。 */
|
|
27
|
+
export interface ResolvableDocument {
|
|
28
|
+
readonly ast: AstModule | null | undefined;
|
|
29
|
+
readonly parseDiagnostics?: readonly {
|
|
30
|
+
readonly severity: string;
|
|
31
|
+
}[];
|
|
32
|
+
readonly vocabulary?: VocabularyScopes;
|
|
33
|
+
}
|
|
34
|
+
export declare function resolveDocument(doc: ResolvableDocument): DocumentResolution;
|
|
35
|
+
/** 光标处写法为 word 的解析位置(多个时取最内层)。 */
|
|
36
|
+
export declare function siteAt(res: DocumentResolution, pos: {
|
|
37
|
+
line: number;
|
|
38
|
+
character: number;
|
|
39
|
+
}, word: string): ResolutionSite | undefined;
|
|
40
|
+
//# sourceMappingURL=resolution.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"resolution.d.ts","sourceRoot":"","sources":["../../../src/lsp/resolution.ts"],"names":[],"mappings":"AAWA,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,0CAA0C,CAAC;AAKjF,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,IAAI,SAAS,EAAE,YAAY,EAAE,IAAI,EAAE,mBAAmB,EAAE,MAAM,aAAa,CAAC;AAEtG,wBAAwB;AACxB,MAAM,WAAW,cAAc;IAC7B,QAAQ,CAAC,IAAI,EAAE,IAAI,CAAC;IACpB,QAAQ,CAAC,OAAO,EAAE,MAAM,CAAC;IACzB,QAAQ,CAAC,SAAS,EAAE,MAAM,CAAC;IAC3B,QAAQ,CAAC,IAAI,EAAE,YAAY,CAAC;IAC5B,6BAA6B;IAC7B,QAAQ,CAAC,MAAM,CAAC,EAAE,MAAM,CAAC;CAC1B;AAED,8BAA8B;AAC9B,MAAM,WAAW,SAAS;IACxB,QAAQ,CAAC,IAAI,EAAE,IAAI,CAAC;IACpB,QAAQ,CAAC,IAAI,EAAE,IAAI,CAAC,IAAI,CAAC;CAC1B;AAED,MAAM,WAAW,kBAAkB;IACjC,qBAAqB;IACrB,QAAQ,CAAC,QAAQ,EAAE,OAAO,CAAC;IAC3B,QAAQ,CAAC,KAAK,EAAE,SAAS,cAAc,EAAE,CAAC;IAC1C,QAAQ,CAAC,UAAU,EAAE,SAAS,SAAS,EAAE,CAAC;IAC1C,yEAAyE;IACzE,QAAQ,CAAC,IAAI,CAAC,EAAE,IAAI,CAAC,MAAM,CAAC;IAC5B,QAAQ,CAAC,WAAW,EAAE,SAAS,mBAAmB,EAAE,CAAC;CACtD;AAED,2CAA2C;AAC3C,MAAM,WAAW,kBAAkB;IACjC,QAAQ,CAAC,GAAG,EAAE,SAAS,GAAG,IAAI,GAAG,SAAS,CAAC;IAC3C,QAAQ,CAAC,gBAAgB,CAAC,EAAE,SAAS;QAAE,QAAQ,CAAC,QAAQ,EAAE,MAAM,CAAA;KAAE,EAAE,CAAC;IACrE,QAAQ,CAAC,UAAU,CAAC,EAAE,gBAAgB,CAAC;CACxC;AAMD,wBAAgB,eAAe,CAAC,GAAG,EAAE,kBAAkB,GAAG,kBAAkB,CAS3E;AAkKD,kCAAkC;AAClC,wBAAgB,MAAM,CACpB,GAAG,EAAE,kBAAkB,EACvB,GAAG,EAAE;IAAE,IAAI,EAAE,MAAM,CAAC;IAAC,SAAS,EAAE,MAAM,CAAA;CAAE,EACxC,IAAI,EAAE,MAAM,GACX,cAAc,GAAG,SAAS,CAI5B"}
|
|
@@ -0,0 +1,179 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* LSP 的名称解析视图(ADR 0051 §5「LSP」一行与 Review Focus 1)。
|
|
3
|
+
*
|
|
4
|
+
* - 语法完整:R1 → lower → R2,收集全部按角色解析的位置(悬停用)与值位置名字的 §4 静态类型(字段补全用)。
|
|
5
|
+
* - 语法不完整(解析器报 error,AST 为恢复出的片段):只对已解析部分运行 R1,**跳过 R2**——
|
|
6
|
+
* 未完成代码上的类型驱动解析不可信,其诊断会级联;悬停仍提供 R1 可得的信息,字段补全降级为不提供。
|
|
7
|
+
* - 任一阶段抛错都降级为空视图:编辑中的源码绝不能让悬停 / 补全 / 诊断失败。
|
|
8
|
+
*
|
|
9
|
+
* 结果按 AST 对象缓存:同一文档版本的诊断、悬停与补全共用一次解析。
|
|
10
|
+
*/
|
|
11
|
+
import { nfc } from '../config/lexicons/identifiers/casefold.js';
|
|
12
|
+
import { hasErrors, resolveAndLower, resolveDeclarationsOnly } from '../compile-pipeline.js';
|
|
13
|
+
import { lowerModule } from '../lower_to_core.js';
|
|
14
|
+
import { originToSpan } from '../typecheck/pure.js';
|
|
15
|
+
const EMPTY = { complete: false, sites: [], typedNames: [], diagnostics: [] };
|
|
16
|
+
const cache = new WeakMap();
|
|
17
|
+
export function resolveDocument(doc) {
|
|
18
|
+
const ast = doc.ast;
|
|
19
|
+
if (!ast)
|
|
20
|
+
return EMPTY;
|
|
21
|
+
const hit = cache.get(ast);
|
|
22
|
+
if (hit)
|
|
23
|
+
return hit;
|
|
24
|
+
const complete = !(doc.parseDiagnostics ?? []).some((d) => d.severity === 'error');
|
|
25
|
+
const result = safely(() => (complete ? resolveComplete(ast, doc.vocabulary) : resolvePartial(ast, doc.vocabulary)));
|
|
26
|
+
cache.set(ast, result);
|
|
27
|
+
return result;
|
|
28
|
+
}
|
|
29
|
+
function safely(run) {
|
|
30
|
+
try {
|
|
31
|
+
return run();
|
|
32
|
+
}
|
|
33
|
+
catch {
|
|
34
|
+
return EMPTY;
|
|
35
|
+
}
|
|
36
|
+
}
|
|
37
|
+
/**
|
|
38
|
+
* 语法不完整:只运行 R1,R2 跳过。R1 无 error 且没有词汇时,R1 输出 lower 后就是可信的 Core
|
|
39
|
+
* (此时无本地化写法需要 R2 改写),仍交给语义 / 类型检查,避免编辑时这些诊断全部消失;
|
|
40
|
+
* 有词汇(Core 中残留未解析的本地化名)或 R1 报错(多为被丢弃声明的级联)时不提供 Core。
|
|
41
|
+
*/
|
|
42
|
+
function resolvePartial(ast, vocabulary) {
|
|
43
|
+
const r1 = resolveDeclarationsOnly(ast, vocabulary);
|
|
44
|
+
const base = { complete: false, sites: collectR1Sites(r1.ast), typedNames: [], diagnostics: r1.diagnostics };
|
|
45
|
+
if (hasErrors(r1.diagnostics) || !isEmptyVocabulary(vocabulary))
|
|
46
|
+
return base;
|
|
47
|
+
return { ...base, core: lowerModule(r1.ast) };
|
|
48
|
+
}
|
|
49
|
+
function isEmptyVocabulary(v) {
|
|
50
|
+
if (!v)
|
|
51
|
+
return true;
|
|
52
|
+
return v.types.size === 0 && v.fields.size === 0 && v.enumMembers.size === 0 && v.functions.size === 0;
|
|
53
|
+
}
|
|
54
|
+
function resolveComplete(ast, vocabulary) {
|
|
55
|
+
const scoped = [];
|
|
56
|
+
const typedNames = [];
|
|
57
|
+
const observer = {
|
|
58
|
+
onScopedSite: (site) => {
|
|
59
|
+
const s = r2Site(site);
|
|
60
|
+
if (s)
|
|
61
|
+
scoped.push(s);
|
|
62
|
+
},
|
|
63
|
+
onTypedName: (name, type) => {
|
|
64
|
+
const span = originToSpan(name.origin);
|
|
65
|
+
if (span && type)
|
|
66
|
+
typedNames.push({ span, type });
|
|
67
|
+
},
|
|
68
|
+
};
|
|
69
|
+
const resolved = resolveAndLower(ast, vocabulary, observer);
|
|
70
|
+
const sites = [...collectR1Sites(resolved.ast), ...scoped];
|
|
71
|
+
return { complete: true, sites, typedNames, core: resolved.core, diagnostics: resolved.diagnostics };
|
|
72
|
+
}
|
|
73
|
+
// ---- 位置收集 ----
|
|
74
|
+
/** 点分写法中第 index 段的位置;写法与位置宽度不符(跨行 / 含空白)时退回整条路径。 */
|
|
75
|
+
function segmentSpan(span, written, index) {
|
|
76
|
+
const sameLine = span.start.line === span.end.line;
|
|
77
|
+
if (!sameLine || span.end.col - span.start.col !== written.length)
|
|
78
|
+
return span;
|
|
79
|
+
const parts = written.split('.');
|
|
80
|
+
const offset = parts.slice(0, index).reduce((n, p) => n + p.length + 1, 0);
|
|
81
|
+
const col = span.start.col + offset;
|
|
82
|
+
return { start: { line: span.start.line, col }, end: { line: span.start.line, col: col + (parts[index]?.length ?? 0) } };
|
|
83
|
+
}
|
|
84
|
+
function r2Site(site) {
|
|
85
|
+
if (!site.span)
|
|
86
|
+
return undefined;
|
|
87
|
+
const span = site.segment ? segmentSpan(site.span, site.segment.path, site.segment.index) : site.span;
|
|
88
|
+
const parent = site.parent === undefined ? {} : { parent: site.parent };
|
|
89
|
+
return { span, written: site.written, canonical: site.canonical, role: site.role, ...parent };
|
|
90
|
+
}
|
|
91
|
+
/** 不含子节点的键:避免把元数据当作节点遍历。 */
|
|
92
|
+
const LEAF_KEYS = new Set(['span', 'nameSpan', 'variantSpans', 'resolved', 'resolvedVariants', 'origin']);
|
|
93
|
+
/** 遍历 R1 输出的 AST,收集全部 resolved。字段的父名取所在 Data / 构造的类型,成员的父名取所在枚举。 */
|
|
94
|
+
function collectR1Sites(ast) {
|
|
95
|
+
const out = [];
|
|
96
|
+
const owners = memberOwners(ast);
|
|
97
|
+
const visit = (node, parent) => {
|
|
98
|
+
if (Array.isArray(node))
|
|
99
|
+
return node.forEach((x) => visit(x, parent));
|
|
100
|
+
if (!node || typeof node !== 'object')
|
|
101
|
+
return;
|
|
102
|
+
const n = node;
|
|
103
|
+
out.push(...ownSites(n, parent, owners));
|
|
104
|
+
for (const [key, value] of Object.entries(n)) {
|
|
105
|
+
if (!LEAF_KEYS.has(key))
|
|
106
|
+
visit(value, key === 'fields' ? n.resolved?.canonical : undefined);
|
|
107
|
+
}
|
|
108
|
+
};
|
|
109
|
+
visit(ast, undefined);
|
|
110
|
+
return out;
|
|
111
|
+
}
|
|
112
|
+
/** 枚举成员规范名 → 唯一所属枚举(多个枚举同名成员时不给父名)。 */
|
|
113
|
+
function memberOwners(ast) {
|
|
114
|
+
const owners = new Map();
|
|
115
|
+
for (const d of ast.decls) {
|
|
116
|
+
if (d.kind !== 'Enum' || !d.resolved)
|
|
117
|
+
continue;
|
|
118
|
+
for (const m of d.resolvedVariants ?? []) {
|
|
119
|
+
owners.set(m.canonical, owners.has(m.canonical) ? undefined : d.resolved.canonical);
|
|
120
|
+
}
|
|
121
|
+
}
|
|
122
|
+
return owners;
|
|
123
|
+
}
|
|
124
|
+
function ownSites(n, parent, owners) {
|
|
125
|
+
const span = n.nameSpan ?? n.span;
|
|
126
|
+
const r = n.resolved;
|
|
127
|
+
const own = r && span ? siteOf(span, r, parent, owners) : [];
|
|
128
|
+
if (n.kind !== 'Enum' || !r)
|
|
129
|
+
return own;
|
|
130
|
+
const variants = (n.resolvedVariants ?? []).flatMap((m, i) => {
|
|
131
|
+
const at = n.variantSpans?.[i] ?? n.span;
|
|
132
|
+
return at ? [{ span: at, written: m.written, canonical: m.canonical, role: m.role, parent: r.canonical }] : [];
|
|
133
|
+
});
|
|
134
|
+
return [...own, ...variants];
|
|
135
|
+
}
|
|
136
|
+
function siteOf(span, r, parent, owners) {
|
|
137
|
+
if (r.role === 'MEMBER_REF' && r.written.includes('.'))
|
|
138
|
+
return qualifiedMember(span, r);
|
|
139
|
+
const owner = r.role === 'MEMBER_REF' ? owners.get(r.canonical) : isScopedRole(r.role) ? parent : undefined;
|
|
140
|
+
const site = { span, written: r.written, canonical: r.canonical, role: r.role };
|
|
141
|
+
return [owner === undefined ? site : { ...site, parent: owner }];
|
|
142
|
+
}
|
|
143
|
+
function isScopedRole(role) {
|
|
144
|
+
return role === 'FIELD_DECL' || role === 'FIELD_REF' || role === 'MEMBER_DECL';
|
|
145
|
+
}
|
|
146
|
+
/** `E.M`:首段为 TYPE,末段为 enumMembers[E] 的成员。 */
|
|
147
|
+
function qualifiedMember(span, r) {
|
|
148
|
+
const written = r.written.split('.');
|
|
149
|
+
const canonical = r.canonical.split('.');
|
|
150
|
+
if (written.length !== 2 || canonical.length !== 2)
|
|
151
|
+
return [];
|
|
152
|
+
const [we, wm] = written;
|
|
153
|
+
const [ce, cm] = canonical;
|
|
154
|
+
return [
|
|
155
|
+
{ span: segmentSpan(span, r.written, 0), written: we, canonical: ce, role: 'TYPE' },
|
|
156
|
+
{ span: segmentSpan(span, r.written, 1), written: wm, canonical: cm, role: 'MEMBER_REF', parent: ce },
|
|
157
|
+
];
|
|
158
|
+
}
|
|
159
|
+
// ---- 查询 ----
|
|
160
|
+
/** LSP 位置(0 基)是否落在 span(1 基、end 不含)内。 */
|
|
161
|
+
function contains(span, pos) {
|
|
162
|
+
const line = pos.line + 1;
|
|
163
|
+
const col = pos.character + 1;
|
|
164
|
+
if (line < span.start.line || line > span.end.line)
|
|
165
|
+
return false;
|
|
166
|
+
if (line === span.start.line && col < span.start.col)
|
|
167
|
+
return false;
|
|
168
|
+
return !(line === span.end.line && col > span.end.col);
|
|
169
|
+
}
|
|
170
|
+
function area(span) {
|
|
171
|
+
return (span.end.line - span.start.line) * 100000 + (span.end.col - span.start.col);
|
|
172
|
+
}
|
|
173
|
+
/** 光标处写法为 word 的解析位置(多个时取最内层)。 */
|
|
174
|
+
export function siteAt(res, pos, word) {
|
|
175
|
+
const w = nfc(word);
|
|
176
|
+
const hits = res.sites.filter((s) => nfc(s.written) === w && contains(s.span, pos));
|
|
177
|
+
return hits.sort((a, b) => area(a.span) - area(b.span))[0];
|
|
178
|
+
}
|
|
179
|
+
//# sourceMappingURL=resolution.js.map
|