maxmustermann/TypeScript
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge pull request #9148 from Microsoft/add-isDefinition-to-references

Browse source 
Add isDefinition to references
This commit is contained in:
Nathan Shively-Sanders 2016-06-14 11:12:53 -07:00 committed by GitHub
parent 8917ddf8a1 102a890214
commit 57f66b8efa
22 changed files with 191 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
src/harness/fourslash.ts
View file

@ -730,7 +730,7 @@ namespace FourSlash {
}
}
public verifyReferencesAtPositionListContains(fileName: string, start: number, end: number, isWriteAccess?: boolean) {
public verifyReferencesAtPositionListContains(fileName: string, start: number, end: number, isWriteAccess?: boolean, isDefinition?: boolean) {
const references = this.getReferencesAtCaret();
if (!references || references.length === 0) {
@ -743,11 +743,14 @@ namespace FourSlash {
if (typeof isWriteAccess !== "undefined" && reference.isWriteAccess !== isWriteAccess) {
this.raiseError(`verifyReferencesAtPositionListContains failed - item isWriteAccess value does not match, actual: ${reference.isWriteAccess}, expected: ${isWriteAccess}.`);
}
if (typeof isDefinition !== "undefined" && reference.isDefinition !== isDefinition) {
this.raiseError(`verifyReferencesAtPositionListContains failed - item isDefinition value does not match, actual: ${reference.isDefinition}, expected: ${isDefinition}.`);
}
return;
}
}
const missingItem = { fileName: fileName, start: start, end: end, isWriteAccess: isWriteAccess };
const missingItem = { fileName, start, end, isWriteAccess, isDefinition };
this.raiseError(`verifyReferencesAtPositionListContains failed - could not find the item: ${stringify(missingItem)} in the returned list: (${stringify(references)})`);
}
@ -2837,8 +2840,8 @@ namespace FourSlashInterface {
this.state.verifyReferencesCountIs(count, /*localFilesOnly*/ false);
}
public referencesAtPositionContains(range: FourSlash.Range, isWriteAccess?: boolean) {
this.state.verifyReferencesAtPositionListContains(range.fileName, range.start, range.end, isWriteAccess);
public referencesAtPositionContains(range: FourSlash.Range, isWriteAccess?: boolean, isDefinition?: boolean) {
this.state.verifyReferencesAtPositionListContains(range.fileName, range.start, range.end, isWriteAccess, isDefinition);
}
public signatureHelpPresent() {

2
src/server/client.ts
View file

@ -376,6 +376,7 @@ namespace ts.server {
fileName: fileName,
textSpan: ts.createTextSpanFromBounds(start, end),
isWriteAccess: entry.isWriteAccess,
isDefinition: entry.isDefinition,
};
});
}
@ -536,6 +537,7 @@ namespace ts.server {
fileName,
textSpan: ts.createTextSpanFromBounds(start, end),
isWriteAccess: entry.isWriteAccess,
isDefinition: false
};
});
}

5
src/server/protocol.d.ts vendored
View file

@ -304,6 +304,11 @@ declare namespace ts.server.protocol {
* True if reference is a write location, false otherwise.
*/
isWriteAccess: boolean;
/**
* True if reference is a definition, false otherwise.
*/
isDefinition: boolean;
}
/**

5
src/server/session.ts
View file

@ -379,7 +379,7 @@ namespace ts.server {
start,
end,
file: fileName,
isWriteAccess
isWriteAccess,
};
});
}
@ -555,7 +555,8 @@ namespace ts.server {
start: start,
lineText: lineText,
end: compilerService.host.positionToLineOffset(ref.fileName, ts.textSpanEnd(ref.textSpan)),
isWriteAccess: ref.isWriteAccess
isWriteAccess: ref.isWriteAccess,
isDefinition: ref.isDefinition
};
});
},

10
src/services/services.ts
View file

@ -1209,6 +1209,7 @@ namespace ts {
textSpan: TextSpan;
fileName: string;
isWriteAccess: boolean;
isDefinition: boolean;
}
export interface DocumentHighlights {
@ -5753,7 +5754,8 @@ namespace ts {
result.push({
fileName: entry.fileName,
textSpan: highlightSpan.textSpan,
isWriteAccess: highlightSpan.kind === HighlightSpanKind.writtenReference
isWriteAccess: highlightSpan.kind === HighlightSpanKind.writtenReference,
isDefinition: false
});
}
}
@ -6187,7 +6189,8 @@ namespace ts {
references: [{
fileName: sourceFile.fileName,
textSpan: createTextSpan(position, searchText.length),
isWriteAccess: false
isWriteAccess: false,
isDefinition: false
}]
});
}
@ -6741,7 +6744,8 @@ namespace ts {
return {
fileName: node.getSourceFile().fileName,
textSpan: createTextSpanFromBounds(start, end),
isWriteAccess: isWriteAccess(node)
isWriteAccess: isWriteAccess(node),
isDefinition: isDeclarationName(node) || isLiteralComputedPropertyDeclarationName(node)
};
}

4
src/services/shims.ts
View file

@ -164,7 +164,7 @@ namespace ts {
/**
* Returns a JSON-encoded value of the type:
* { fileName: string; textSpan: { start: number; length: number}; isWriteAccess: boolean }[]
* { fileName: string; textSpan: { start: number; length: number}; isWriteAccess: boolean, isDefinition?: boolean }[]
*/
getReferencesAtPosition(fileName: string, position: number): string;
@ -1141,4 +1141,4 @@ namespace TypeScript.Services {
/* @internal */
const toolsVersion = "1.9";
/* tslint:enable:no-unused-variable */
/* tslint:enable:no-unused-variable */

2
tests/cases/fourslash/fourslash.ts
View file

@ -125,7 +125,7 @@ declare namespace FourSlashInterface {
completionListAllowsNewIdentifier(): void;
memberListIsEmpty(): void;
referencesCountIs(count: number): void;
referencesAtPositionContains(range: Range, isWriteAccess?: boolean): void;
referencesAtPositionContains(range: Range, isWriteAccess?: boolean, isDefinition?: boolean): void;
signatureHelpPresent(): void;
errorExistsBetweenMarkers(startMarker: string, endMarker: string): void;
errorExistsAfterMarker(markerName?: string): void;

8
tests/cases/fourslash/getOccurrencesIsDefinitionOfArrowFunction.ts Normal file
View file

@ -0,0 +1,8 @@
/// <reference path='fourslash.ts' />
////var [|{| "isDefinition": true |}f|] = x => x + 1;
////[|{| "isDefinition": false |}f|](12);
var firstRange = test.ranges()[0];
goTo.position(firstRange.start, firstRange.fileName);
test.ranges().forEach(range => {
verify.referencesAtPositionContains(range, undefined, range.marker.data.isDefinition);
});

8
tests/cases/fourslash/getOccurrencesIsDefinitionOfBindingPattern.ts Normal file
View file

@ -0,0 +1,8 @@
/// <reference path='fourslash.ts' />
////const { [|{| "isDefinition": true |}x|], y } = { x: 1, y: 2 };
////const z = [|{| "isDefinition": false |}x|];
var firstRange = test.ranges()[0];
goTo.position(firstRange.start, firstRange.fileName);
test.ranges().forEach(range => {
verify.referencesAtPositionContains(range, undefined, range.marker.data.isDefinition);
});

13
tests/cases/fourslash/getOccurrencesIsDefinitionOfClass.ts Normal file
View file

@ -0,0 +1,13 @@
/// <reference path='fourslash.ts' />
////class [|{| "isDefinition": true |}C|] {
//// n: number;
//// constructor() {
//// this.n = 12;
//// }
////}
////let c = new [|{| "isDefinition": false |}C|]();
var firstRange = test.ranges()[0];
goTo.position(firstRange.start, firstRange.fileName);
test.ranges().forEach(range => {
verify.referencesAtPositionContains(range, undefined, range.marker.data.isDefinition);
});

9
tests/cases/fourslash/getOccurrencesIsDefinitionOfComputedProperty.ts Normal file
View file

@ -0,0 +1,9 @@
/// <reference path='fourslash.ts' />
////let o = { ["[|{| "isDefinition": true |}foo|]"]: 12 };
////let y = o.[|{| "isDefinition": false |}foo|];
////let z = o['[|{| "isDefinition": false |}foo|]'];
var firstRange = test.ranges()[0];
goTo.position(firstRange.start, firstRange.fileName);
test.ranges().forEach(range => {
verify.referencesAtPositionContains(range, undefined, range.marker.data.isDefinition);
});

11
tests/cases/fourslash/getOccurrencesIsDefinitionOfEnum.ts Normal file
View file

@ -0,0 +1,11 @@
/// <reference path='fourslash.ts' />
////enum [|{| "isDefinition": true |}E|] {
//// First,
//// Second
////}
////let first = [|{| "isDefinition": false |}E|].First;
var firstRange = test.ranges()[0];
goTo.position(firstRange.start, firstRange.fileName);
test.ranges().forEach(range => {
verify.referencesAtPositionContains(range, undefined, range.marker.data.isDefinition);
});

11
tests/cases/fourslash/getOccurrencesIsDefinitionOfExport.ts Normal file
View file

@ -0,0 +1,11 @@
/// <reference path='fourslash.ts' />
// @Filename: m.ts
////export var [|{| "isDefinition": true |}x|] = 12;
// @Filename: main.ts
////import { [|{| "isDefinition": true |}x|] } from "./m";
////const y = [|{| "isDefinition": false |}x|];
var firstRange = test.ranges()[0];
goTo.position(firstRange.start, firstRange.fileName);
test.ranges().forEach(range => {
verify.referencesAtPositionContains(range, undefined, range.marker.data.isDefinition);
});

9
tests/cases/fourslash/getOccurrencesIsDefinitionOfFunction.ts Normal file
View file

@ -0,0 +1,9 @@
/// <reference path='fourslash.ts' />
////function [|{| "isDefinition": true |}func|](x: number) {
////}
////[|{| "isDefinition": false |}func|](x)
var firstRange = test.ranges()[0];
goTo.position(firstRange.start, firstRange.fileName);
test.ranges().forEach(range => {
verify.referencesAtPositionContains(range, undefined, range.marker.data.isDefinition);
});

10
tests/cases/fourslash/getOccurrencesIsDefinitionOfInterface.ts Normal file
View file

@ -0,0 +1,10 @@
/// <reference path='fourslash.ts' />
////interface [|{| "isDefinition": true |}I|] {
//// p: number;
////}
////let i: [|{| "isDefinition": false |}I|] = { p: 12 };
var firstRange = test.ranges()[0];
goTo.position(firstRange.start, firstRange.fileName);
test.ranges().forEach(range => {
verify.referencesAtPositionContains(range, undefined, range.marker.data.isDefinition);
});

19
tests/cases/fourslash/getOccurrencesIsDefinitionOfInterfaceClassMerge.ts Normal file
View file

@ -0,0 +1,19 @@
/// <reference path='fourslash.ts' />
////interface [|{| "isDefinition": true |}Numbers|] {
//// p: number;
////}
////interface [|{| "isDefinition": true |}Numbers|] {
//// m: number;
////}
////class [|{| "isDefinition": true |}Numbers|] {
//// f(n: number) {
//// return this.p + this.m + n;
//// }
////}
////let i: [|{| "isDefinition": false |}Numbers|] = new [|{| "isDefinition": false |}Numbers|]();
////let x = i.f(i.p + i.m);
var firstRange = test.ranges()[0];
goTo.position(firstRange.start, firstRange.fileName);
test.ranges().forEach(range => {
verify.referencesAtPositionContains(range, undefined, range.marker.data.isDefinition);
});

10
tests/cases/fourslash/getOccurrencesIsDefinitionOfNamespace.ts Normal file
View file

@ -0,0 +1,10 @@
/// <reference path='fourslash.ts' />
////namespace [|{| "isDefinition": true |}Numbers|] {
//// export var n = 12;
////}
////let x = [|{| "isDefinition": false |}Numbers|].n + 1;
var firstRange = test.ranges()[0];
goTo.position(firstRange.start, firstRange.fileName);
test.ranges().forEach(range => {
verify.referencesAtPositionContains(range, undefined, range.marker.data.isDefinition);
});

8
tests/cases/fourslash/getOccurrencesIsDefinitionOfNumberNamedProperty.ts Normal file
View file

@ -0,0 +1,8 @@
/// <reference path='fourslash.ts' />
////let o = { [|{| "isDefinition": true |}1|]: 12 };
////let y = o[[|{| "isDefinition": false |}1|]];
var firstRange = test.ranges()[0];
goTo.position(firstRange.start, firstRange.fileName);
test.ranges().forEach(range => {
verify.referencesAtPositionContains(range, undefined, range.marker.data.isDefinition);
});

9
tests/cases/fourslash/getOccurrencesIsDefinitionOfParameter.ts Normal file
View file

@ -0,0 +1,9 @@
/// <reference path='fourslash.ts' />
////function f([|{| "isDefinition": true |}x|]: number) {
//// return [|{| "isDefinition": false |}x|] + 1
////}
var firstRange = test.ranges()[0];
goTo.position(firstRange.start, firstRange.fileName);
test.ranges().forEach(range => {
verify.referencesAtPositionContains(range, undefined, range.marker.data.isDefinition);
});

8
tests/cases/fourslash/getOccurrencesIsDefinitionOfStringNamedProperty.ts Normal file
View file

@ -0,0 +1,8 @@
/// <reference path='fourslash.ts' />
////let o = { "[|{| "isDefinition": true |}x|]": 12 };
////let y = o.[|{| "isDefinition": false |}x|];
var firstRange = test.ranges()[0];
goTo.position(firstRange.start, firstRange.fileName);
test.ranges().forEach(range => {
verify.referencesAtPositionContains(range, undefined, range.marker.data.isDefinition);
});

8
tests/cases/fourslash/getOccurrencesIsDefinitionOfTypeAlias.ts Normal file
View file

@ -0,0 +1,8 @@
/// <reference path='fourslash.ts' />
////type [|{| "isDefinition": true |}Alias|]= number;
////let n: [|{| "isDefinition": false |}Alias|] = 12;
var firstRange = test.ranges()[0];
goTo.position(firstRange.start, firstRange.fileName);
test.ranges().forEach(range => {
verify.referencesAtPositionContains(range, undefined, range.marker.data.isDefinition);
});

23
tests/cases/fourslash/getOccurrencesIsDefinitionOfVariable.ts Normal file
View file

@ -0,0 +1,23 @@
/// <reference path='fourslash.ts' />
////var [|{| "isDefinition": true |}x|] = 0;
////var assignmentRightHandSide = [|{| "isDefinition": false |}x|];
////var assignmentRightHandSide2 = 1 + [|{| "isDefinition": false |}x|];
////
////[|{| "isDefinition": false |}x|] = 1;
////[|{| "isDefinition": false |}x|] = [|{| "isDefinition": false |}x|] + [|{| "isDefinition": false |}x|];
////
////[|{| "isDefinition": false |}x|] == 1;
////[|{| "isDefinition": false |}x|] <= 1;
////
////var preIncrement = ++[|{| "isDefinition": false |}x|];
////var postIncrement = [|{| "isDefinition": false |}x|]++;
////var preDecrement = --[|{| "isDefinition": false |}x|];
////var postDecrement = [|{| "isDefinition": false |}x|]--;
////
////[|{| "isDefinition": false |}x|] += 1;
////[|{| "isDefinition": false |}x|] <<= 1;
var firstRange = test.ranges()[0];
goTo.position(firstRange.start, firstRange.fileName);
test.ranges().forEach(range => {
verify.referencesAtPositionContains(range, undefined, range.marker.data.isDefinition);
});