@typespec/compiler 0.57.0-dev.8 → 0.58.0-dev.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/dist/generated-defs/TypeSpec.d.ts +30 -24
- package/dist/generated-defs/TypeSpec.d.ts.map +1 -1
- package/dist/generated-defs/TypeSpec.ts-test.js +2 -1
- package/dist/generated-defs/TypeSpec.ts-test.js.map +1 -1
- package/dist/manifest.js +2 -2
- package/dist/src/config/config-schema.d.ts +1 -1
- package/dist/src/config/config-schema.d.ts.map +1 -1
- package/dist/src/core/charcode.d.ts +4 -1
- package/dist/src/core/charcode.d.ts.map +1 -1
- package/dist/src/core/charcode.js +4 -4
- package/dist/src/core/charcode.js.map +1 -1
- package/dist/src/core/checker.d.ts.map +1 -1
- package/dist/src/core/checker.js +284 -18
- package/dist/src/core/checker.js.map +1 -1
- package/dist/src/core/cli/utils.d.ts.map +1 -1
- package/dist/src/core/cli/utils.js +1 -0
- package/dist/src/core/cli/utils.js.map +1 -1
- package/dist/src/core/index.d.ts +1 -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/linter.d.ts +5 -1
- package/dist/src/core/linter.d.ts.map +1 -1
- package/dist/src/core/linter.js +32 -13
- package/dist/src/core/linter.js.map +1 -1
- package/dist/src/core/messages.d.ts +5 -0
- package/dist/src/core/messages.d.ts.map +1 -1
- package/dist/src/core/messages.js +1 -0
- package/dist/src/core/messages.js.map +1 -1
- package/dist/src/core/parser.d.ts +11 -2
- package/dist/src/core/parser.d.ts.map +1 -1
- package/dist/src/core/parser.js +216 -60
- package/dist/src/core/parser.js.map +1 -1
- package/dist/src/core/program.d.ts.map +1 -1
- package/dist/src/core/program.js +4 -2
- package/dist/src/core/program.js.map +1 -1
- package/dist/src/core/scanner.d.ts +17 -1
- package/dist/src/core/scanner.d.ts.map +1 -1
- package/dist/src/core/scanner.js +97 -1
- package/dist/src/core/scanner.js.map +1 -1
- package/dist/src/core/schema-validator.js +1 -1
- package/dist/src/core/schema-validator.js.map +1 -1
- package/dist/src/core/types.d.ts +103 -50
- package/dist/src/core/types.d.ts.map +1 -1
- package/dist/src/core/types.js +50 -46
- package/dist/src/core/types.js.map +1 -1
- package/dist/src/emitter-framework/asset-emitter.js +2 -2
- package/dist/src/emitter-framework/asset-emitter.js.map +1 -1
- package/dist/src/emitter-framework/type-emitter.d.ts +1 -1
- package/dist/src/emitter-framework/type-emitter.js +1 -1
- package/dist/src/formatter/print/printer.d.ts +1 -1
- package/dist/src/formatter/print/printer.d.ts.map +1 -1
- package/dist/src/formatter/print/printer.js +91 -12
- package/dist/src/formatter/print/printer.js.map +1 -1
- package/dist/src/init/init-template.d.ts +1 -1
- package/dist/src/init/init-template.d.ts.map +1 -1
- package/dist/src/lib/decorators.d.ts +2 -1
- package/dist/src/lib/decorators.d.ts.map +1 -1
- package/dist/src/lib/decorators.js +17 -0
- package/dist/src/lib/decorators.js.map +1 -1
- package/dist/src/server/classify.d.ts.map +1 -1
- package/dist/src/server/classify.js +4 -0
- package/dist/src/server/classify.js.map +1 -1
- package/dist/src/server/compile-service.d.ts +2 -2
- package/dist/src/server/compile-service.d.ts.map +1 -1
- package/dist/src/server/compile-service.js +26 -1
- package/dist/src/server/compile-service.js.map +1 -1
- package/dist/src/server/completion.d.ts +2 -2
- package/dist/src/server/completion.d.ts.map +1 -1
- package/dist/src/server/completion.js +136 -9
- package/dist/src/server/completion.js.map +1 -1
- package/dist/src/server/file-system-cache.d.ts +3 -1
- package/dist/src/server/file-system-cache.d.ts.map +1 -1
- package/dist/src/server/file-system-cache.js +13 -2
- package/dist/src/server/file-system-cache.js.map +1 -1
- package/dist/src/server/server.js +35 -8
- package/dist/src/server/server.js.map +1 -1
- package/dist/src/server/serverlib.d.ts.map +1 -1
- package/dist/src/server/serverlib.js +13 -31
- package/dist/src/server/serverlib.js.map +1 -1
- package/dist/src/server/tmlanguage.d.ts.map +1 -1
- package/dist/src/server/tmlanguage.js +1 -1
- package/dist/src/server/tmlanguage.js.map +1 -1
- package/dist/src/server/type-details.js +14 -6
- package/dist/src/server/type-details.js.map +1 -1
- package/dist/src/server/types.d.ts +9 -3
- package/dist/src/server/types.d.ts.map +1 -1
- package/dist/src/server/types.js.map +1 -1
- package/dist/src/testing/test-server-host.js +2 -2
- package/dist/src/testing/test-server-host.js.map +1 -1
- package/dist/typespec.tmLanguage +1 -1
- package/lib/std/decorators.tsp +6 -0
- package/lib/std/types.tsp +12 -0
- package/package.json +11 -11
- package/templates/scaffolding.json +4 -4
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"classify.d.ts","sourceRoot":"","sources":["../../../src/server/classify.ts"],"names":[],"mappings":"AAAA,OAAO,EAQL,kBAAkB,EAMnB,MAAM,kBAAkB,CAAC;AAC1B,OAAO,EAAE,aAAa,EAAqB,MAAM,YAAY,CAAC;AAE9D;;;GAGG;AACH,wBAAgB,iBAAiB,CAAC,GAAG,EAAE,kBAAkB,GAAG,aAAa,EAAE,
|
|
1
|
+
{"version":3,"file":"classify.d.ts","sourceRoot":"","sources":["../../../src/server/classify.ts"],"names":[],"mappings":"AAAA,OAAO,EAQL,kBAAkB,EAMnB,MAAM,kBAAkB,CAAC;AAC1B,OAAO,EAAE,aAAa,EAAqB,MAAM,YAAY,CAAC;AAE9D;;;GAGG;AACH,wBAAgB,iBAAiB,CAAC,GAAG,EAAE,kBAAkB,GAAG,aAAa,EAAE,CAiV1E"}
|
|
@@ -262,6 +262,10 @@ export function getSemanticTokens(ast) {
|
|
|
262
262
|
classifyDocTag(node.tagName, SemanticTokenKind.DocCommentTag);
|
|
263
263
|
classifyOverride(node.paramName, SemanticTokenKind.Variable);
|
|
264
264
|
break;
|
|
265
|
+
case SyntaxKind.DocPropTag:
|
|
266
|
+
classifyDocTag(node.tagName, SemanticTokenKind.DocCommentTag);
|
|
267
|
+
classifyOverride(node.propName, SemanticTokenKind.Variable);
|
|
268
|
+
break;
|
|
265
269
|
case SyntaxKind.DocReturnsTag:
|
|
266
270
|
classifyDocTag(node.tagName, SemanticTokenKind.DocCommentTag);
|
|
267
271
|
break;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"classify.js","sourceRoot":"","sources":["../../../src/server/classify.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"classify.js","sourceRoot":"","sources":["../../../src/server/classify.ts"],"names":[],"mappings":"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"}
|
|
@@ -3,7 +3,7 @@ import { TextDocument } from "vscode-languageserver-textdocument";
|
|
|
3
3
|
import { CompilerHost, TypeSpecScriptNode } from "../core/index.js";
|
|
4
4
|
import { FileService } from "./file-service.js";
|
|
5
5
|
import { FileSystemCache } from "./file-system-cache.js";
|
|
6
|
-
import { CompileResult, ServerHost } from "./types.js";
|
|
6
|
+
import { CompileResult, ServerHost, ServerLog } from "./types.js";
|
|
7
7
|
/**
|
|
8
8
|
* Service managing compilation/caching of different TypeSpec projects
|
|
9
9
|
*/
|
|
@@ -36,7 +36,7 @@ export interface CompileServiceOptions {
|
|
|
36
36
|
readonly fileService: FileService;
|
|
37
37
|
readonly serverHost: ServerHost;
|
|
38
38
|
readonly compilerHost: CompilerHost;
|
|
39
|
-
readonly log: (
|
|
39
|
+
readonly log: (log: ServerLog) => void;
|
|
40
40
|
}
|
|
41
41
|
export declare function createCompileService({ compilerHost, serverHost, fileService, fileSystemCache, log, }: CompileServiceOptions): CompileService;
|
|
42
42
|
//# sourceMappingURL=compile-service.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"compile-service.d.ts","sourceRoot":"","sources":["../../../src/server/compile-service.ts"],"names":[],"mappings":"AAAA,OAAO,EAA6B,sBAAsB,EAAE,MAAM,uBAAuB,CAAC;AAC1F,OAAO,EAAE,YAAY,EAAE,MAAM,oCAAoC,CAAC;AAQlE,OAAO,EACL,YAAY,EAIZ,kBAAkB,EAMnB,MAAM,kBAAkB,CAAC;AAI1B,OAAO,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAC;AAChD,OAAO,EAAE,eAAe,EAAE,MAAM,wBAAwB,CAAC;AACzD,OAAO,EAAE,aAAa,EAAE,UAAU,EAAE,MAAM,YAAY,CAAC;
|
|
1
|
+
{"version":3,"file":"compile-service.d.ts","sourceRoot":"","sources":["../../../src/server/compile-service.ts"],"names":[],"mappings":"AAAA,OAAO,EAA6B,sBAAsB,EAAE,MAAM,uBAAuB,CAAC;AAC1F,OAAO,EAAE,YAAY,EAAE,MAAM,oCAAoC,CAAC;AAQlE,OAAO,EACL,YAAY,EAIZ,kBAAkB,EAMnB,MAAM,kBAAkB,CAAC;AAI1B,OAAO,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAC;AAChD,OAAO,EAAE,eAAe,EAAE,MAAM,wBAAwB,CAAC;AACzD,OAAO,EAAE,aAAa,EAAE,UAAU,EAAE,SAAS,EAAE,MAAM,YAAY,CAAC;AAGlE;;GAEG;AACH,MAAM,WAAW,cAAc;IAC7B;;;;;;;;OAQG;IACH,OAAO,CAAC,QAAQ,EAAE,YAAY,GAAG,sBAAsB,GAAG,OAAO,CAAC,aAAa,GAAG,SAAS,CAAC,CAAC;IAE7F;;;OAGG;IACH,SAAS,CAAC,QAAQ,EAAE,YAAY,GAAG,sBAAsB,GAAG,OAAO,CAAC,kBAAkB,CAAC,CAAC;IAExF;;;;OAIG;IACH,YAAY,CAAC,QAAQ,EAAE,YAAY,GAAG,IAAI,CAAC;IAE3C,EAAE,CAAC,KAAK,EAAE,YAAY,EAAE,QAAQ,EAAE,CAAC,MAAM,EAAE,aAAa,KAAK,IAAI,GAAG,IAAI,CAAC;CAC1E;AAED,MAAM,WAAW,qBAAqB;IACpC,QAAQ,CAAC,eAAe,EAAE,eAAe,CAAC;IAC1C,QAAQ,CAAC,WAAW,EAAE,WAAW,CAAC;IAClC,QAAQ,CAAC,UAAU,EAAE,UAAU,CAAC;IAChC,QAAQ,CAAC,YAAY,EAAE,YAAY,CAAC;IACpC,QAAQ,CAAC,GAAG,EAAE,CAAC,GAAG,EAAE,SAAS,KAAK,IAAI,CAAC;CACxC;AAED,wBAAgB,oBAAoB,CAAC,EACnC,YAAY,EACZ,UAAU,EACV,WAAW,EACX,eAAe,EACf,GAAG,GACJ,EAAE,qBAAqB,GAAG,cAAc,CA0NxC"}
|
|
@@ -27,11 +27,13 @@ export function createCompileService({ compilerHost, serverHost, fileService, fi
|
|
|
27
27
|
const path = await fileService.getPath(document);
|
|
28
28
|
const mainFile = await getMainFileForDocument(path);
|
|
29
29
|
const config = await getConfig(mainFile);
|
|
30
|
+
log({ level: "debug", message: `config resolved`, detail: config });
|
|
30
31
|
const [optionsFromConfig, _] = resolveOptionsFromConfig(config, { cwd: path });
|
|
31
32
|
const options = {
|
|
32
33
|
...optionsFromConfig,
|
|
33
34
|
...serverOptions,
|
|
34
35
|
};
|
|
36
|
+
log({ level: "debug", message: `compiler options resolved`, detail: options });
|
|
35
37
|
if (!fileService.upToDate(document)) {
|
|
36
38
|
return undefined;
|
|
37
39
|
}
|
|
@@ -45,6 +47,10 @@ export function createCompileService({ compilerHost, serverHost, fileService, fi
|
|
|
45
47
|
if (mainFile !== path && !program.sourceFiles.has(path)) {
|
|
46
48
|
// If the file that changed wasn't imported by anything from the main
|
|
47
49
|
// file, retry using the file itself as the main file.
|
|
50
|
+
log({
|
|
51
|
+
level: "debug",
|
|
52
|
+
message: `target file was not included in compiling, try to compile ${path} as main file directly`,
|
|
53
|
+
});
|
|
48
54
|
program = await compileProgram(compilerHost, path, options, oldPrograms.get(path));
|
|
49
55
|
oldPrograms.set(path, program);
|
|
50
56
|
}
|
|
@@ -83,6 +89,10 @@ export function createCompileService({ compilerHost, serverHost, fileService, fi
|
|
|
83
89
|
const lookupDir = entrypointStat.isDirectory() ? mainFile : getDirectoryPath(mainFile);
|
|
84
90
|
const configPath = await findTypeSpecConfigPath(compilerHost, lookupDir, true);
|
|
85
91
|
if (!configPath) {
|
|
92
|
+
log({
|
|
93
|
+
level: "debug",
|
|
94
|
+
message: `can't find path with config file, try to use default config`,
|
|
95
|
+
});
|
|
86
96
|
return { ...defaultConfig, projectRoot: getDirectoryPath(mainFile) };
|
|
87
97
|
}
|
|
88
98
|
const cached = await fileSystemCache.get(configPath);
|
|
@@ -122,6 +132,7 @@ export function createCompileService({ compilerHost, serverHost, fileService, fi
|
|
|
122
132
|
*/
|
|
123
133
|
async function getMainFileForDocument(path) {
|
|
124
134
|
if (path.startsWith("untitled:")) {
|
|
135
|
+
log({ level: "debug", message: `untitled document treated as its own main file: ${path}` });
|
|
125
136
|
return path;
|
|
126
137
|
}
|
|
127
138
|
let dir = getDirectoryPath(path);
|
|
@@ -140,22 +151,36 @@ export function createCompileService({ compilerHost, serverHost, fileService, fi
|
|
|
140
151
|
}
|
|
141
152
|
const tspMain = resolveTspMain(pkg);
|
|
142
153
|
if (typeof tspMain === "string") {
|
|
154
|
+
log({
|
|
155
|
+
level: "debug",
|
|
156
|
+
message: `tspMain resolved from package.json (${pkgPath}) as ${tspMain}`,
|
|
157
|
+
});
|
|
143
158
|
mainFile = tspMain;
|
|
144
159
|
}
|
|
145
160
|
const candidate = joinPaths(dir, mainFile);
|
|
146
161
|
const stat = await doIO(() => compilerHost.stat(candidate), candidate, logMainFileSearchDiagnostic, options);
|
|
147
162
|
if (stat?.isFile()) {
|
|
163
|
+
log({ level: "debug", message: `main file found as ${candidate}` });
|
|
148
164
|
return candidate;
|
|
149
165
|
}
|
|
150
166
|
const parentDir = getDirectoryPath(dir);
|
|
151
167
|
if (parentDir === dir) {
|
|
152
168
|
break;
|
|
153
169
|
}
|
|
170
|
+
log({
|
|
171
|
+
level: "debug",
|
|
172
|
+
message: `main file not found in ${dir}, search in parent directory ${parentDir}`,
|
|
173
|
+
});
|
|
154
174
|
dir = parentDir;
|
|
155
175
|
}
|
|
176
|
+
log({ level: "debug", message: `reached directory root, using ${path} as main file` });
|
|
156
177
|
return path;
|
|
157
178
|
function logMainFileSearchDiagnostic(diagnostic) {
|
|
158
|
-
log(
|
|
179
|
+
log({
|
|
180
|
+
level: `error`,
|
|
181
|
+
message: `Unexpected diagnostic while looking for main file of ${path}`,
|
|
182
|
+
detail: formatDiagnostic(diagnostic),
|
|
183
|
+
});
|
|
159
184
|
}
|
|
160
185
|
}
|
|
161
186
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"compile-service.js","sourceRoot":"","sources":["../../../src/server/compile-service.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,kBAAkB,EAAE,KAAK,EAA0B,MAAM,uBAAuB,CAAC;AAE1F,OAAO,EACL,aAAa,EACb,sBAAsB,EACtB,sBAAsB,GACvB,MAAM,4BAA4B,CAAC;AACpC,OAAO,EAAE,wBAAwB,EAAE,MAAM,gCAAgC,CAAC;AAE1E,OAAO,EAML,cAAc,EACd,gBAAgB,EAChB,gBAAgB,EAChB,SAAS,EACT,KAAK,GACN,MAAM,kBAAkB,CAAC;AAC1B,OAAO,EAAE,OAAO,IAAI,cAAc,EAAE,MAAM,oBAAoB,CAAC;AAC/D,OAAO,EAAE,IAAI,EAAE,QAAQ,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAC;AAClE,OAAO,EAAE,aAAa,EAAE,MAAM,gBAAgB,CAAC;AAI/C,OAAO,EAAE,YAAY,EAAE,MAAM,qBAAqB,CAAC;AAyCnD,MAAM,UAAU,oBAAoB,CAAC,EACnC,YAAY,EACZ,UAAU,EACV,WAAW,EACX,eAAe,EACf,GAAG,GACmB;IACtB,MAAM,WAAW,GAAG,IAAI,GAAG,EAAmB,CAAC;IAC/C,MAAM,cAAc,GAAG,IAAI,GAAG,EAAwC,CAAC;IACvE,MAAM,OAAO,GAAG,IAAI,YAAY,CAAC,CAAC,QAAQ,EAAE,EAAE,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC,CAAC;IAElE,OAAO,EAAE,OAAO,EAAE,SAAS,EAAE,EAAE,EAAE,YAAY,EAAE,CAAC;IAEhD,SAAS,EAAE,CAAC,KAAa,EAAE,QAAkC;QAC3D,cAAc,CAAC,GAAG,CAAC,KAAK,EAAE,QAAQ,CAAC,CAAC;IACtC,CAAC;IAED,SAAS,MAAM,CAAC,KAAa,EAAE,GAAG,IAAe;QAC/C,MAAM,QAAQ,GAAG,cAAc,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;QAC3C,IAAI,QAAQ,EAAE,CAAC;YACb,QAAQ,CAAC,GAAG,IAAI,CAAC,CAAC;QACpB,CAAC;IACH,CAAC;IAED,SAAS,YAAY,CAAC,QAAsB;QAC1C,OAAO,CAAC,cAAc,CAAC,QAAQ,CAAC,CAAC;IACnC,CAAC;IAED,KAAK,UAAU,OAAO,CACpB,QAA+C;QAE/C,MAAM,IAAI,GAAG,MAAM,WAAW,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC;QACjD,MAAM,QAAQ,GAAG,MAAM,sBAAsB,CAAC,IAAI,CAAC,CAAC;QACpD,MAAM,MAAM,GAAG,MAAM,SAAS,CAAC,QAAQ,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"compile-service.js","sourceRoot":"","sources":["../../../src/server/compile-service.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,10 +1,10 @@
|
|
|
1
1
|
import { CompletionList, CompletionParams } from "vscode-languageserver";
|
|
2
|
-
import {
|
|
2
|
+
import { PositionDetail, Program, TypeSpecScriptNode } from "../core/index.js";
|
|
3
3
|
export type CompletionContext = {
|
|
4
4
|
program: Program;
|
|
5
5
|
params: CompletionParams;
|
|
6
6
|
file: TypeSpecScriptNode;
|
|
7
7
|
completions: CompletionList;
|
|
8
8
|
};
|
|
9
|
-
export declare function resolveCompletion(context: CompletionContext,
|
|
9
|
+
export declare function resolveCompletion(context: CompletionContext, posDetail: PositionDetail): Promise<CompletionList>;
|
|
10
10
|
//# sourceMappingURL=completion.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"completion.d.ts","sourceRoot":"","sources":["../../../src/server/completion.ts"],"names":[],"mappings":"AAAA,OAAO,
|
|
1
|
+
{"version":3,"file":"completion.d.ts","sourceRoot":"","sources":["../../../src/server/completion.ts"],"names":[],"mappings":"AAAA,OAAO,EAGL,cAAc,EACd,gBAAgB,EAGjB,MAAM,uBAAuB,CAAC;AAE/B,OAAO,EAML,cAAc,EACd,OAAO,EAKP,kBAAkB,EAInB,MAAM,kBAAkB,CAAC;AAY1B,MAAM,MAAM,iBAAiB,GAAG;IAC9B,OAAO,EAAE,OAAO,CAAC;IACjB,MAAM,EAAE,gBAAgB,CAAC;IACzB,IAAI,EAAE,kBAAkB,CAAC;IACzB,WAAW,EAAE,cAAc,CAAC;CAC7B,CAAC;AAEF,wBAAsB,iBAAiB,CACrC,OAAO,EAAE,iBAAiB,EAC1B,SAAS,EAAE,cAAc,GACxB,OAAO,CAAC,cAAc,CAAC,CA6BzB"}
|
|
@@ -1,11 +1,94 @@
|
|
|
1
|
-
import { CompletionItemKind,
|
|
1
|
+
import { CompletionItemKind, MarkupKind, TextEdit, } from "vscode-languageserver";
|
|
2
2
|
import { getDeprecationDetails } from "../core/deprecation.js";
|
|
3
|
-
import { SyntaxKind, } from "../core/index.js";
|
|
3
|
+
import { SyntaxKind, compilerAssert, getFirstAncestor, positionInRange, } from "../core/index.js";
|
|
4
4
|
import { getAnyExtensionFromPath, getBaseFileName, getDirectoryPath, hasTrailingDirectorySeparator, resolvePath, } from "../core/path-utils.js";
|
|
5
5
|
import { printId } from "../formatter/print/printer.js";
|
|
6
6
|
import { findProjectRoot, loadFile, resolveTspMain } from "../utils/misc.js";
|
|
7
7
|
import { getSymbolDetails } from "./type-details.js";
|
|
8
|
-
export async function resolveCompletion(context,
|
|
8
|
+
export async function resolveCompletion(context, posDetail) {
|
|
9
|
+
let node = posDetail.node;
|
|
10
|
+
if (!node) {
|
|
11
|
+
if (posDetail.triviaStartPosition === 0 ||
|
|
12
|
+
!addCompletionByLookingBackward(posDetail, context)) {
|
|
13
|
+
addKeywordCompletion("root", context.completions);
|
|
14
|
+
}
|
|
15
|
+
}
|
|
16
|
+
else {
|
|
17
|
+
// look back first to see whether we can get some completion from the previous statement, e.g. `model Foo |`
|
|
18
|
+
if (!addCompletionByLookingBackward(posDetail, context)) {
|
|
19
|
+
if (posDetail.inTrivia) {
|
|
20
|
+
// If we're not immediately after an identifier character, then advance
|
|
21
|
+
// the position past any trivia. This is done because a zero-width
|
|
22
|
+
// inserted missing identifier that the user is now trying to complete
|
|
23
|
+
// starts after the trivia following the cursor.
|
|
24
|
+
node = posDetail.getPositionDetailAfterTrivia().node;
|
|
25
|
+
}
|
|
26
|
+
await AddCompletionNonTrivia(node, context, posDetail);
|
|
27
|
+
}
|
|
28
|
+
else {
|
|
29
|
+
if (!posDetail.inTrivia) {
|
|
30
|
+
await AddCompletionNonTrivia(node, context, posDetail);
|
|
31
|
+
}
|
|
32
|
+
}
|
|
33
|
+
}
|
|
34
|
+
return context.completions;
|
|
35
|
+
}
|
|
36
|
+
function addCompletionByLookingBackward(posDetail, context) {
|
|
37
|
+
if (posDetail.triviaStartPosition === 0) {
|
|
38
|
+
return false;
|
|
39
|
+
}
|
|
40
|
+
const preDetail = posDetail.getPositionDetailBeforeTrivia();
|
|
41
|
+
if (!preDetail.node) {
|
|
42
|
+
return false;
|
|
43
|
+
}
|
|
44
|
+
const node = getFirstAncestor(preDetail.node, (n) => n.kind === SyntaxKind.ModelStatement ||
|
|
45
|
+
n.kind === SyntaxKind.ScalarStatement ||
|
|
46
|
+
n.kind === SyntaxKind.OperationStatement ||
|
|
47
|
+
n.kind === SyntaxKind.InterfaceStatement ||
|
|
48
|
+
n.kind === SyntaxKind.TemplateParameterDeclaration, true /*includeSelf*/);
|
|
49
|
+
return node !== undefined && addCompletionByLookingBackwardNode(node, posDetail, context);
|
|
50
|
+
}
|
|
51
|
+
function addCompletionByLookingBackwardNode(preNode, posDetail, context) {
|
|
52
|
+
const getIdentifierEndPos = (n) => {
|
|
53
|
+
// n.pos === n.end, it means it's a missing identifier, just return -1;
|
|
54
|
+
return n.pos === n.end ? -1 : n.end;
|
|
55
|
+
};
|
|
56
|
+
const map = {
|
|
57
|
+
[SyntaxKind.ModelStatement]: "modelHeader",
|
|
58
|
+
[SyntaxKind.ScalarStatement]: "scalarHeader",
|
|
59
|
+
[SyntaxKind.OperationStatement]: "operationHeader",
|
|
60
|
+
[SyntaxKind.InterfaceStatement]: "interfaceHeader",
|
|
61
|
+
};
|
|
62
|
+
switch (preNode?.kind) {
|
|
63
|
+
case SyntaxKind.ModelStatement:
|
|
64
|
+
case SyntaxKind.ScalarStatement:
|
|
65
|
+
case SyntaxKind.OperationStatement:
|
|
66
|
+
case SyntaxKind.InterfaceStatement:
|
|
67
|
+
const idEndPos = preNode.templateParametersRange.end >= 0
|
|
68
|
+
? preNode.templateParametersRange.end
|
|
69
|
+
: getIdentifierEndPos(preNode.id);
|
|
70
|
+
if (posDetail.triviaStartPosition === idEndPos) {
|
|
71
|
+
const key = map[preNode.kind];
|
|
72
|
+
if (!key) {
|
|
73
|
+
compilerAssert(false, "KeywordArea missing in keyarea map.");
|
|
74
|
+
}
|
|
75
|
+
addKeywordCompletion(key, context.completions);
|
|
76
|
+
return true;
|
|
77
|
+
}
|
|
78
|
+
break;
|
|
79
|
+
case SyntaxKind.TemplateParameterDeclaration:
|
|
80
|
+
if (posDetail.triviaStartPosition === getIdentifierEndPos(preNode.id)) {
|
|
81
|
+
addKeywordCompletion("templateParameter", context.completions);
|
|
82
|
+
return true;
|
|
83
|
+
}
|
|
84
|
+
else if (preNode.parent?.templateParametersRange.end === posDetail.triviaStartPosition) {
|
|
85
|
+
return addCompletionByLookingBackwardNode(preNode.parent, posDetail, context);
|
|
86
|
+
}
|
|
87
|
+
break;
|
|
88
|
+
}
|
|
89
|
+
return false;
|
|
90
|
+
}
|
|
91
|
+
async function AddCompletionNonTrivia(node, context, posDetail, lookBackward = true) {
|
|
9
92
|
if (node === undefined ||
|
|
10
93
|
node.kind === SyntaxKind.InvalidStatement ||
|
|
11
94
|
(node.kind === SyntaxKind.Identifier &&
|
|
@@ -19,7 +102,9 @@ export async function resolveCompletion(context, node) {
|
|
|
19
102
|
addKeywordCompletion("namespace", context.completions);
|
|
20
103
|
break;
|
|
21
104
|
case SyntaxKind.ScalarStatement:
|
|
22
|
-
|
|
105
|
+
if (positionInRange(posDetail.position, node.bodyRange)) {
|
|
106
|
+
addKeywordCompletion("scalarBody", context.completions);
|
|
107
|
+
}
|
|
23
108
|
break;
|
|
24
109
|
case SyntaxKind.Identifier:
|
|
25
110
|
addDirectiveCompletion(context, node);
|
|
@@ -30,9 +115,13 @@ export async function resolveCompletion(context, node) {
|
|
|
30
115
|
await addImportCompletion(context, node);
|
|
31
116
|
}
|
|
32
117
|
break;
|
|
118
|
+
case SyntaxKind.ModelStatement:
|
|
119
|
+
case SyntaxKind.ObjectLiteral:
|
|
120
|
+
case SyntaxKind.ModelExpression:
|
|
121
|
+
addModelCompletion(context, posDetail);
|
|
122
|
+
break;
|
|
33
123
|
}
|
|
34
124
|
}
|
|
35
|
-
return context.completions;
|
|
36
125
|
}
|
|
37
126
|
const keywords = [
|
|
38
127
|
// Root only
|
|
@@ -51,8 +140,11 @@ const keywords = [
|
|
|
51
140
|
["fn", { root: true, namespace: true }],
|
|
52
141
|
["const", { root: true, namespace: true }],
|
|
53
142
|
// On model `model Foo <keyword> ...`
|
|
54
|
-
[
|
|
55
|
-
|
|
143
|
+
[
|
|
144
|
+
"extends",
|
|
145
|
+
{ modelHeader: true, scalarHeader: true, templateParameter: true, interfaceHeader: true },
|
|
146
|
+
],
|
|
147
|
+
["is", { modelHeader: true, operationHeader: true }],
|
|
56
148
|
// On identifier
|
|
57
149
|
["true", { identifier: true }],
|
|
58
150
|
["false", { identifier: true }],
|
|
@@ -62,7 +154,7 @@ const keywords = [
|
|
|
62
154
|
// Modifiers
|
|
63
155
|
["extern", { root: true, namespace: true }],
|
|
64
156
|
// Scalars
|
|
65
|
-
["init", {
|
|
157
|
+
["init", { scalarBody: true }],
|
|
66
158
|
];
|
|
67
159
|
function addKeywordCompletion(area, completions) {
|
|
68
160
|
const filteredKeywords = keywords.filter(([_, x]) => area in x);
|
|
@@ -166,6 +258,38 @@ async function addRelativePathCompletion({ program, completions, file }, node) {
|
|
|
166
258
|
}
|
|
167
259
|
}
|
|
168
260
|
}
|
|
261
|
+
function addModelCompletion(context, posDetail) {
|
|
262
|
+
const node = posDetail.node;
|
|
263
|
+
if (!node ||
|
|
264
|
+
(node.kind !== SyntaxKind.ModelStatement &&
|
|
265
|
+
node.kind !== SyntaxKind.ModelExpression &&
|
|
266
|
+
node.kind !== SyntaxKind.ObjectLiteral)) {
|
|
267
|
+
return;
|
|
268
|
+
}
|
|
269
|
+
if (posDetail.position === node.bodyRange.end) {
|
|
270
|
+
// skip the scenario like `{ ... }|`
|
|
271
|
+
return;
|
|
272
|
+
}
|
|
273
|
+
else {
|
|
274
|
+
// create a fake identifier node to further resolve the completions for the model/object
|
|
275
|
+
// it's a little tricky but can help to keep things clean and simple while the cons. is limited
|
|
276
|
+
// TODO: consider adding support in resolveCompletions for non-identifier-node directly when we find more scenario and worth the cost
|
|
277
|
+
const fakeProp = {
|
|
278
|
+
kind: node.kind === SyntaxKind.ObjectLiteral
|
|
279
|
+
? SyntaxKind.ObjectLiteralProperty
|
|
280
|
+
: SyntaxKind.ModelProperty,
|
|
281
|
+
flags: 0 /* NodeFlags.None */,
|
|
282
|
+
parent: node,
|
|
283
|
+
};
|
|
284
|
+
const fakeId = {
|
|
285
|
+
kind: SyntaxKind.Identifier,
|
|
286
|
+
sv: "",
|
|
287
|
+
flags: 0 /* NodeFlags.None */,
|
|
288
|
+
parent: fakeProp,
|
|
289
|
+
};
|
|
290
|
+
addIdentifierCompletion(context, fakeId);
|
|
291
|
+
}
|
|
292
|
+
}
|
|
169
293
|
/**
|
|
170
294
|
* Add completion options for an identifier.
|
|
171
295
|
*/
|
|
@@ -206,7 +330,10 @@ function addIdentifierCompletion({ program, completions }, node) {
|
|
|
206
330
|
insertText: printId(key) + (suffix ?? ""),
|
|
207
331
|
};
|
|
208
332
|
if (deprecated) {
|
|
209
|
-
|
|
333
|
+
// hide these deprecated items to discourage the usage
|
|
334
|
+
// not using CompletionItemTag.Deprecated because the strike-through is a little confusing
|
|
335
|
+
// and also it's not supported in vs extension
|
|
336
|
+
continue;
|
|
210
337
|
}
|
|
211
338
|
completions.items.push(item);
|
|
212
339
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"completion.js","sourceRoot":"","sources":["../../../src/server/completion.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"completion.js","sourceRoot":"","sources":["../../../src/server/completion.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,6 +1,7 @@
|
|
|
1
1
|
import { FileEvent } from "vscode-languageserver";
|
|
2
2
|
import { SourceFile } from "../core/types.js";
|
|
3
3
|
import { FileService } from "./file-service.js";
|
|
4
|
+
import { ServerLog } from "./types.js";
|
|
4
5
|
export interface FileSystemCache {
|
|
5
6
|
get(path: string): Promise<CachedFile | CachedError | undefined>;
|
|
6
7
|
set(path: string, entry: CachedFile | CachedError): void;
|
|
@@ -19,7 +20,8 @@ export interface CachedError {
|
|
|
19
20
|
data?: any;
|
|
20
21
|
version?: undefined;
|
|
21
22
|
}
|
|
22
|
-
export declare function createFileSystemCache({ fileService, }: {
|
|
23
|
+
export declare function createFileSystemCache({ fileService, log, }: {
|
|
23
24
|
fileService: FileService;
|
|
25
|
+
log: (log: ServerLog) => void;
|
|
24
26
|
}): FileSystemCache;
|
|
25
27
|
//# sourceMappingURL=file-system-cache.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"file-system-cache.d.ts","sourceRoot":"","sources":["../../../src/server/file-system-cache.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,uBAAuB,CAAC;AAClD,OAAO,EAAE,UAAU,EAAE,MAAM,kBAAkB,CAAC;AAC9C,OAAO,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAC;
|
|
1
|
+
{"version":3,"file":"file-system-cache.d.ts","sourceRoot":"","sources":["../../../src/server/file-system-cache.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,uBAAuB,CAAC;AAClD,OAAO,EAAE,UAAU,EAAE,MAAM,kBAAkB,CAAC;AAC9C,OAAO,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAC;AAChD,OAAO,EAAE,SAAS,EAAE,MAAM,YAAY,CAAC;AAEvC,MAAM,WAAW,eAAe;IAC9B,GAAG,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,UAAU,GAAG,WAAW,GAAG,SAAS,CAAC,CAAC;IACjE,GAAG,CAAC,IAAI,EAAE,MAAM,EAAE,KAAK,EAAE,UAAU,GAAG,WAAW,GAAG,IAAI,CAAC;IACzD,OAAO,CAAC,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,GAAG,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;IAChD,MAAM,CAAC,OAAO,EAAE,SAAS,EAAE,GAAG,IAAI,CAAC;CACpC;AAED,MAAM,WAAW,UAAU;IACzB,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,EAAE,UAAU,CAAC;IACjB,OAAO,CAAC,EAAE,MAAM,CAAC;IAIjB,IAAI,CAAC,EAAE,GAAG,CAAC;CACZ;AAED,MAAM,WAAW,WAAW;IAC1B,IAAI,EAAE,OAAO,CAAC;IACd,KAAK,EAAE,OAAO,CAAC;IACf,IAAI,CAAC,EAAE,GAAG,CAAC;IACX,OAAO,CAAC,EAAE,SAAS,CAAC;CACrB;AACD,wBAAgB,qBAAqB,CAAC,EACpC,WAAW,EACX,GAAG,GACJ,EAAE;IACD,WAAW,EAAE,WAAW,CAAC;IACzB,GAAG,EAAE,CAAC,GAAG,EAAE,SAAS,KAAK,IAAI,CAAC;CAC/B,GAAG,eAAe,CAoClB"}
|
|
@@ -1,14 +1,25 @@
|
|
|
1
|
-
export function createFileSystemCache({ fileService, }) {
|
|
1
|
+
export function createFileSystemCache({ fileService, log, }) {
|
|
2
2
|
const cache = new Map();
|
|
3
3
|
let changes = [];
|
|
4
4
|
return {
|
|
5
5
|
async get(path) {
|
|
6
6
|
for (const change of changes) {
|
|
7
7
|
const path = await fileService.fileURLToRealPath(change.uri);
|
|
8
|
+
log({
|
|
9
|
+
level: "trace",
|
|
10
|
+
message: `FileSystemCache entry with key '${path}' removed`,
|
|
11
|
+
});
|
|
8
12
|
cache.delete(path);
|
|
9
13
|
}
|
|
10
14
|
changes = [];
|
|
11
|
-
|
|
15
|
+
const r = cache.get(path);
|
|
16
|
+
if (!r) {
|
|
17
|
+
const target = {};
|
|
18
|
+
Error.captureStackTrace(target);
|
|
19
|
+
const callstack = target.stack.substring("Error\n".length);
|
|
20
|
+
log({ level: "trace", message: `FileSystemCache miss for ${path}`, detail: callstack });
|
|
21
|
+
}
|
|
22
|
+
return r;
|
|
12
23
|
},
|
|
13
24
|
set(path, entry) {
|
|
14
25
|
cache.set(path, entry);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"file-system-cache.js","sourceRoot":"","sources":["../../../src/server/file-system-cache.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"file-system-cache.js","sourceRoot":"","sources":["../../../src/server/file-system-cache.ts"],"names":[],"mappings":"AA4BA,MAAM,UAAU,qBAAqB,CAAC,EACpC,WAAW,EACX,GAAG,GAIJ;IACC,MAAM,KAAK,GAAG,IAAI,GAAG,EAAoC,CAAC;IAC1D,IAAI,OAAO,GAAgB,EAAE,CAAC;IAC9B,OAAO;QACL,KAAK,CAAC,GAAG,CAAC,IAAY;YACpB,KAAK,MAAM,MAAM,IAAI,OAAO,EAAE,CAAC;gBAC7B,MAAM,IAAI,GAAG,MAAM,WAAW,CAAC,iBAAiB,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC;gBAC7D,GAAG,CAAC;oBACF,KAAK,EAAE,OAAO;oBACd,OAAO,EAAE,mCAAmC,IAAI,WAAW;iBAC5D,CAAC,CAAC;gBACH,KAAK,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;YACrB,CAAC;YACD,OAAO,GAAG,EAAE,CAAC;YACb,MAAM,CAAC,GAAG,KAAK,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;YAC1B,IAAI,CAAC,CAAC,EAAE,CAAC;gBACP,MAAM,MAAM,GAAQ,EAAE,CAAC;gBACvB,KAAK,CAAC,iBAAiB,CAAC,MAAM,CAAC,CAAC;gBAChC,MAAM,SAAS,GAAG,MAAM,CAAC,KAAK,CAAC,SAAS,CAAC,SAAS,CAAC,MAAM,CAAC,CAAC;gBAC3D,GAAG,CAAC,EAAE,KAAK,EAAE,OAAO,EAAE,OAAO,EAAE,4BAA4B,IAAI,EAAE,EAAE,MAAM,EAAE,SAAS,EAAE,CAAC,CAAC;YAC1F,CAAC;YACD,OAAO,CAAC,CAAC;QACX,CAAC;QACD,GAAG,CAAC,IAAY,EAAE,KAA+B;YAC/C,KAAK,CAAC,GAAG,CAAC,IAAI,EAAE,KAAK,CAAC,CAAC;QACzB,CAAC;QACD,KAAK,CAAC,OAAO,CAAC,IAAY,EAAE,IAAS;YACnC,MAAM,KAAK,GAAG,MAAM,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;YACnC,IAAI,KAAK,EAAE,CAAC;gBACV,KAAK,CAAC,IAAI,GAAG,IAAI,CAAC;YACpB,CAAC;QACH,CAAC;QACD,MAAM,CAAC,OAAoB;YACzB,OAAO,CAAC,IAAI,CAAC,GAAG,OAAO,CAAC,CAAC;QAC3B,CAAC;KACF,CAAC;AACJ,CAAC"}
|
|
@@ -32,8 +32,35 @@ function main() {
|
|
|
32
32
|
sendDiagnostics(params) {
|
|
33
33
|
void connection.sendDiagnostics(params);
|
|
34
34
|
},
|
|
35
|
-
log(
|
|
36
|
-
|
|
35
|
+
log(log) {
|
|
36
|
+
const message = log.message;
|
|
37
|
+
let detail = undefined;
|
|
38
|
+
let fullMessage = message;
|
|
39
|
+
if (log.detail) {
|
|
40
|
+
detail =
|
|
41
|
+
typeof log.detail === "string" ? log.detail : JSON.stringify(log.detail, undefined, 2);
|
|
42
|
+
fullMessage = `${message}:\n${detail}`;
|
|
43
|
+
}
|
|
44
|
+
switch (log.level) {
|
|
45
|
+
case "trace":
|
|
46
|
+
connection.tracer.log(message, detail);
|
|
47
|
+
break;
|
|
48
|
+
case "debug":
|
|
49
|
+
connection.console.debug(fullMessage);
|
|
50
|
+
break;
|
|
51
|
+
case "info":
|
|
52
|
+
connection.console.info(fullMessage);
|
|
53
|
+
break;
|
|
54
|
+
case "warning":
|
|
55
|
+
connection.console.warn(fullMessage);
|
|
56
|
+
break;
|
|
57
|
+
case "error":
|
|
58
|
+
connection.console.error(fullMessage);
|
|
59
|
+
break;
|
|
60
|
+
default:
|
|
61
|
+
connection.console.error(`Log Message with invalid LogLevel (${log.level}). Raw Message: ${fullMessage}`);
|
|
62
|
+
break;
|
|
63
|
+
}
|
|
37
64
|
},
|
|
38
65
|
getOpenDocumentByURL(url) {
|
|
39
66
|
return documents.get(url);
|
|
@@ -44,12 +71,12 @@ function main() {
|
|
|
44
71
|
};
|
|
45
72
|
const s = createServer(host);
|
|
46
73
|
server = s;
|
|
47
|
-
s.log(`TypeSpec language server v${typespecVersion}`);
|
|
48
|
-
s.log(
|
|
49
|
-
s.log(
|
|
50
|
-
s.log(
|
|
74
|
+
s.log({ level: `info`, message: `TypeSpec language server v${typespecVersion}` });
|
|
75
|
+
s.log({ level: `info`, message: `Module: ${fileURLToPath(import.meta.url)}` });
|
|
76
|
+
s.log({ level: `info`, message: `Process ID: ${process.pid}` });
|
|
77
|
+
s.log({ level: `info`, message: `Command Line`, detail: process.argv });
|
|
51
78
|
if (profileDir) {
|
|
52
|
-
s.log(
|
|
79
|
+
s.log({ level: `info`, message: `CPU profiling enabled with dir: ${profileDir}` });
|
|
53
80
|
profileSession = new inspector.Session();
|
|
54
81
|
profileSession.connect();
|
|
55
82
|
}
|
|
@@ -126,7 +153,7 @@ function time(func) {
|
|
|
126
153
|
const start = Date.now();
|
|
127
154
|
const ret = await func.apply(undefined, args);
|
|
128
155
|
const end = Date.now();
|
|
129
|
-
server.log(func.name
|
|
156
|
+
server.log({ level: `trace`, message: `${func.name}: ${end - start + " ms"}` });
|
|
130
157
|
return ret;
|
|
131
158
|
});
|
|
132
159
|
}
|