microsoft/TypeScript
1
0
Fork 0
mirror of https://github.com/microsoft/TypeScript.git synced 2026-02-15 20:25:23 -06:00
Code Issues Packages Projects Releases 212 Wiki Activity

enable semantic classification

Browse Source
This commit is contained in:
Vladimir Matveev 2016-06-15 18:30:08 -07:00
parent 64423257ca
commit 7b93e732d5
2 changed files with 41 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/server/protocol.d.ts vendored
View File

@ -182,6 +182,15 @@ declare namespace ts.server.protocol {
arguments: FileLocationRequestArgs;
}
export interface FileSpanRequestArgs extends FileRequestArgs {
start: number;
length: number;
}
export interface FileSpanRequest extends FileRequest {
arguments: FileSpanRequestArgs;
}
/**
* Arguments in document highlight request; include: filesToSearch, file,
* line, offset.

51
src/server/session.ts
View File

@ -138,6 +138,7 @@ namespace ts.server {
export const CloseExternalProject = "closeExternalProject";
export const SynchronizeProjectList = "synchronizeProjectList";
export const ApplyChangedToOpenFiles = "applyChangedToOpenFiles";
export const EncodedSemanticClassificationsFull = "encodedSemanticClassifications-full";
}
namespace Errors {
@ -251,25 +252,6 @@ namespace ts.server {
return { line, offset: offset + 1 };
}
private getSemanticDiagnostics(args: protocol.FileRequestArgs): protocol.DiagnosticWithLinePosition[] {
const file = normalizePath(args.file);
var project = (args.projectFileName && this.projectService.getProject(normalizePath(args.projectFileName))) || this.projectService.getProjectForFile(file);
if (!project) {
return [];
}
const scriptInfo = project.getScriptInfo(file);
const diagnostics = project.languageService.getSemanticDiagnostics(file);
return diagnostics.map(d => <protocol.DiagnosticWithLinePosition>{
message: flattenDiagnosticMessageText(d.messageText, this.host.newLine),
start: d.start,
length: d.length,
category: DiagnosticCategory[d.category].toLowerCase(),
code: d.code,
startLocation: this.getLocation(d.start, scriptInfo),
endLocation: this.getLocation(d.start + d.length, scriptInfo)
});
}
private semanticCheck(file: string, project: Project) {
try {
const diags = project.languageService.getSemanticDiagnostics(file);
@ -346,6 +328,34 @@ namespace ts.server {
}
}
private getEncodedSemanticClassifications(args: protocol.FileSpanRequestArgs) {
const file = normalizePath(args.file);
const project = this.projectService.getProjectForFile(file);
if (!project) {
throw Errors.NoProject;
}
return project.languageService.getEncodedSemanticClassifications(file, args);
}
private getSemanticDiagnostics(args: protocol.FileRequestArgs): protocol.DiagnosticWithLinePosition[] {
const file = normalizePath(args.file);
var project = (args.projectFileName && this.projectService.getProject(normalizePath(args.projectFileName))) || this.projectService.getProjectForFile(file);
if (!project) {
throw Errors.NoProject;
}
const scriptInfo = project.getScriptInfo(file);
const diagnostics = project.languageService.getSemanticDiagnostics(file);
return diagnostics.map(d => <protocol.DiagnosticWithLinePosition>{
message: flattenDiagnosticMessageText(d.messageText, this.host.newLine),
start: d.start,
length: d.length,
category: DiagnosticCategory[d.category].toLowerCase(),
code: d.code,
startLocation: this.getLocation(d.start, scriptInfo),
endLocation: this.getLocation(d.start + d.length, scriptInfo)
});
}
private getDefinition(args: protocol.FileLocationRequestArgs, simplifiedResult: boolean): protocol.FileSpan[] | DefinitionInfo[] {
const file = ts.normalizePath(args.file);
const project = this.projectService.getProjectForFile(file);
@ -1198,6 +1208,9 @@ namespace ts.server {
[CommandNames.SemanticDiagnosticsFull]: (request: protocol.FileRequest) => {
return this.requiredResponse(this.getSemanticDiagnostics(request.arguments));
},
[CommandNames.EncodedSemanticClassificationsFull]: (request: protocol.FileSpanRequest) => {
return this.requiredResponse(this.getEncodedSemanticClassifications(request.arguments));
},
[CommandNames.Geterr]: (request: protocol.Request) => {
const geterrArgs = <protocol.GeterrRequestArgs>request.arguments;
return { response: this.getDiagnostics(geterrArgs.delay, geterrArgs.files), responseRequired: false };