microsoft/TypeScript
1
0
Fork 0
mirror of https://github.com/microsoft/TypeScript.git synced 2026-02-05 08:11:30 -06:00
Code Issues Packages Projects Releases 212 Wiki Activity

Wire navto tests

Browse Source
This commit is contained in:
Mohamed Hegazy 2015-02-12 12:52:26 -08:00
parent 4a44b7437a
commit c987ab93f0
3 changed files with 49 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
src/server/client.ts
View File

@ -80,6 +80,10 @@ module ts.server {
return this.host.getScriptSnapshot(fileName).getLength();
}
getFileNames(): string[] {
return this.host.getScriptFileNames();
}
close(): void {
}
@ -107,6 +111,7 @@ module ts.server {
private sequence: number = 0;
private host: SessionClientHostProxy;
private expantionTable: ts.Map<string>;
private fileMapping: ts.Map<string> = {};
constructor(host: SessionClientHost, abbreviate: boolean) {
this.sequence = 0;
@ -177,14 +182,14 @@ module ts.server {
};
}
private getFileNameFromEncodedFile(fileId: ServerProtocol.EncodedFile, fileMapping: ts.Map<string>): string {
private getFileNameFromEncodedFile(fileId: ServerProtocol.EncodedFile): string {
var fileName: string;
if (typeof fileId === "object") {
fileName = (<ServerProtocol.IdFile>fileId).file;
fileMapping[(<ServerProtocol.IdFile>fileId).id] = fileName;
this.fileMapping[(<ServerProtocol.IdFile>fileId).id] = fileName;
}
else if (typeof fileId === "number") {
fileName = ts.lookUp(fileMapping, fileId.toString());
fileName = ts.lookUp(this.fileMapping, fileId.toString());
Debug.assert(!!fileName, "Did not find filename in previous fileID mappings.");
}
else {
@ -330,21 +335,23 @@ module ts.server {
};
}
getNavigateToItems(seatchTerm: string): NavigateToItem[] {
var request = this.processRequest("navto", { seatchTerm });
getNavigateToItems(searchTerm: string): NavigateToItem[] {
var request = this.processRequest("navto", {
searchTerm,
file: this.host.getFileNames()[0]
});
var response = this.processResponse<ServerProtocol.NavtoResponse>(request);
var fileMapping: ts.Map<string> = {};
return response.body.map(entry => {
var fileName = this.getFileNameFromEncodedFile(entry.file, fileMapping);
var start = this.lineColToPosition(entry.file.toString(), entry.start);
var end = this.lineColToPosition(entry.file.toString(), entry.end);
var fileName = this.getFileNameFromEncodedFile(entry.file);
var start = this.lineColToPosition(fileName, entry.start);
var end = this.lineColToPosition(fileName, entry.end);
return {
name: entry.name,
containerName: entry.containerName,
containerKind: entry.containerKind,
containerName: entry.containerName || "",
containerKind: entry.containerKind || "",
kind: entry.kind,
kindModifiers: entry.kindModifiers,
matchKind: entry.matchKind,

3
src/server/protocol.ts
View File

@ -1051,6 +1051,9 @@ module ts.server {
this.output(undefined, CommandNames.Navto, reqSeq, "no nav items");
}
}
else {
this.output(undefined, CommandNames.Navto, reqSeq, "no nav items");
}
}
executeJSONcmd(cmd: string) {

28
tests/cases/fourslash/server/navto.ts Normal file
View File

@ -0,0 +1,28 @@
/// <reference path="fourslash.ts"/>
/////// Module
////{| "itemName": "Shapes", "kind": "module", "parentName": "", "matchKind": "substring" |}module Shapes {
////
//// // Class
//// {| "itemName": "Point", "kind": "class", "parentName": "Shapes", "matchKind": "substring" |}export class Point {
//// // Instance member
//// {| "itemName": "originPointAttheHorizon", "kind": "property", "parentName": "Point", "matchKind": "substring"|}private originPointAttheHorizon = 0.0;
////
//// // Getter
//// {| "itemName": "distanceFromOrigin", "kind": "getter", "parentName": "Point", "matchKind": "substring" |}get distanceFromOrigin(): number { return 0; }
////
//// }
////}
////
////// Local variables
////{| "itemName": "myPointThatIJustInitiated", "kind": "var", "parentName": "", "matchKind": "substring"|}var myPointThatIJustInitiated = new Shapes.Point();
//// Testing for substring matching of navigationItems
//var searchValue = "FromOrigin horizon INITIATED Shape Point";
test.markers().forEach((marker) => {
if (marker.data) {
var name = marker.data.itemName;
verify.navigationItemsListContains(name, marker.data.kind, name.substr(1), marker.data.matchKind, marker.fileName, marker.data.parentName);
}
});