mirror of
https://github.com/microsoft/TypeScript.git
synced 2026-05-27 22:39:59 -05:00
Merge branch 'findReferences' into javascriptLanguageservice
This commit is contained in:
@@ -1589,6 +1589,7 @@ declare module "typescript" {
|
||||
getDefinitionAtPosition(fileName: string, position: number): DefinitionInfo[];
|
||||
getReferencesAtPosition(fileName: string, position: number): ReferenceEntry[];
|
||||
getOccurrencesAtPosition(fileName: string, position: number): ReferenceEntry[];
|
||||
findReferences(fileName: string, position: number): ReferencedSymbol[];
|
||||
getNavigateToItems(searchValue: string, maxResultCount?: number): NavigateToItem[];
|
||||
getNavigationBarItems(fileName: string): NavigationBarItem[];
|
||||
getOutliningSpans(fileName: string): OutliningSpan[];
|
||||
@@ -1675,6 +1676,10 @@ declare module "typescript" {
|
||||
containerKind: string;
|
||||
containerName: string;
|
||||
}
|
||||
interface ReferencedSymbol {
|
||||
definition: DefinitionInfo;
|
||||
references: ReferenceEntry[];
|
||||
}
|
||||
enum SymbolDisplayPartKind {
|
||||
aliasName = 0,
|
||||
className = 1,
|
||||
|
||||
@@ -5157,6 +5157,12 @@ declare module "typescript" {
|
||||
}
|
||||
|
||||
const enum ModuleKind {
|
||||
|
||||
>ModuleKind : ModuleKind
|
||||
|
||||
None = 0,
|
||||
|
||||
>None : ModuleKind
|
||||
|
||||
CommonJS = 1,
|
||||
|
||||
@@ -5427,6 +5433,17 @@ declare module "typescript" {
|
||||
|
||||
d = 100,
|
||||
|
||||
>d : CharacterCodes
|
||||
|
||||
e = 101,
|
||||
|
||||
>e : CharacterCodes
|
||||
|
||||
f = 102,
|
||||
|
||||
>f : CharacterCodes
|
||||
|
||||
g = 103,
|
||||
|
||||
>g : CharacterCodes
|
||||
|
||||
|
||||
@@ -1620,6 +1620,7 @@ declare module "typescript" {
|
||||
getDefinitionAtPosition(fileName: string, position: number): DefinitionInfo[];
|
||||
getReferencesAtPosition(fileName: string, position: number): ReferenceEntry[];
|
||||
getOccurrencesAtPosition(fileName: string, position: number): ReferenceEntry[];
|
||||
findReferences(fileName: string, position: number): ReferencedSymbol[];
|
||||
getNavigateToItems(searchValue: string, maxResultCount?: number): NavigateToItem[];
|
||||
getNavigationBarItems(fileName: string): NavigationBarItem[];
|
||||
getOutliningSpans(fileName: string): OutliningSpan[];
|
||||
@@ -1706,6 +1707,10 @@ declare module "typescript" {
|
||||
containerKind: string;
|
||||
containerName: string;
|
||||
}
|
||||
interface ReferencedSymbol {
|
||||
definition: DefinitionInfo;
|
||||
references: ReferenceEntry[];
|
||||
}
|
||||
enum SymbolDisplayPartKind {
|
||||
aliasName = 0,
|
||||
className = 1,
|
||||
|
||||
@@ -5303,6 +5303,12 @@ declare module "typescript" {
|
||||
}
|
||||
|
||||
const enum ModuleKind {
|
||||
|
||||
>ModuleKind : ModuleKind
|
||||
|
||||
None = 0,
|
||||
|
||||
>None : ModuleKind
|
||||
|
||||
CommonJS = 1,
|
||||
|
||||
@@ -5573,6 +5579,17 @@ declare module "typescript" {
|
||||
|
||||
d = 100,
|
||||
|
||||
>d : CharacterCodes
|
||||
|
||||
e = 101,
|
||||
|
||||
>e : CharacterCodes
|
||||
|
||||
f = 102,
|
||||
|
||||
>f : CharacterCodes
|
||||
|
||||
g = 103,
|
||||
|
||||
>g : CharacterCodes
|
||||
|
||||
|
||||
@@ -1621,6 +1621,7 @@ declare module "typescript" {
|
||||
getDefinitionAtPosition(fileName: string, position: number): DefinitionInfo[];
|
||||
getReferencesAtPosition(fileName: string, position: number): ReferenceEntry[];
|
||||
getOccurrencesAtPosition(fileName: string, position: number): ReferenceEntry[];
|
||||
findReferences(fileName: string, position: number): ReferencedSymbol[];
|
||||
getNavigateToItems(searchValue: string, maxResultCount?: number): NavigateToItem[];
|
||||
getNavigationBarItems(fileName: string): NavigationBarItem[];
|
||||
getOutliningSpans(fileName: string): OutliningSpan[];
|
||||
@@ -1707,6 +1708,10 @@ declare module "typescript" {
|
||||
containerKind: string;
|
||||
containerName: string;
|
||||
}
|
||||
interface ReferencedSymbol {
|
||||
definition: DefinitionInfo;
|
||||
references: ReferenceEntry[];
|
||||
}
|
||||
enum SymbolDisplayPartKind {
|
||||
aliasName = 0,
|
||||
className = 1,
|
||||
|
||||
@@ -5253,6 +5253,12 @@ declare module "typescript" {
|
||||
}
|
||||
|
||||
const enum ModuleKind {
|
||||
|
||||
>ModuleKind : ModuleKind
|
||||
|
||||
None = 0,
|
||||
|
||||
>None : ModuleKind
|
||||
|
||||
CommonJS = 1,
|
||||
|
||||
@@ -5523,6 +5529,17 @@ declare module "typescript" {
|
||||
|
||||
d = 100,
|
||||
|
||||
>d : CharacterCodes
|
||||
|
||||
e = 101,
|
||||
|
||||
>e : CharacterCodes
|
||||
|
||||
f = 102,
|
||||
|
||||
>f : CharacterCodes
|
||||
|
||||
g = 103,
|
||||
|
||||
>g : CharacterCodes
|
||||
|
||||
|
||||
@@ -1658,6 +1658,7 @@ declare module "typescript" {
|
||||
getDefinitionAtPosition(fileName: string, position: number): DefinitionInfo[];
|
||||
getReferencesAtPosition(fileName: string, position: number): ReferenceEntry[];
|
||||
getOccurrencesAtPosition(fileName: string, position: number): ReferenceEntry[];
|
||||
findReferences(fileName: string, position: number): ReferencedSymbol[];
|
||||
getNavigateToItems(searchValue: string, maxResultCount?: number): NavigateToItem[];
|
||||
getNavigationBarItems(fileName: string): NavigationBarItem[];
|
||||
getOutliningSpans(fileName: string): OutliningSpan[];
|
||||
@@ -1744,6 +1745,10 @@ declare module "typescript" {
|
||||
containerKind: string;
|
||||
containerName: string;
|
||||
}
|
||||
interface ReferencedSymbol {
|
||||
definition: DefinitionInfo;
|
||||
references: ReferenceEntry[];
|
||||
}
|
||||
enum SymbolDisplayPartKind {
|
||||
aliasName = 0,
|
||||
className = 1,
|
||||
|
||||
@@ -5426,6 +5426,12 @@ declare module "typescript" {
|
||||
}
|
||||
|
||||
const enum ModuleKind {
|
||||
|
||||
>ModuleKind : ModuleKind
|
||||
|
||||
None = 0,
|
||||
|
||||
>None : ModuleKind
|
||||
|
||||
CommonJS = 1,
|
||||
|
||||
@@ -5696,6 +5702,17 @@ declare module "typescript" {
|
||||
|
||||
d = 100,
|
||||
|
||||
>d : CharacterCodes
|
||||
|
||||
e = 101,
|
||||
|
||||
>e : CharacterCodes
|
||||
|
||||
f = 102,
|
||||
|
||||
>f : CharacterCodes
|
||||
|
||||
g = 103,
|
||||
|
||||
>g : CharacterCodes
|
||||
|
||||
|
||||
@@ -13,4 +13,4 @@ goTo.marker('1');
|
||||
verify.referencesCountIs(3);
|
||||
|
||||
goTo.marker('2');
|
||||
verify.referencesCountIs(1);
|
||||
verify.referencesCountIs(0);
|
||||
@@ -17,4 +17,4 @@
|
||||
|
||||
// "any" should not be highlighted
|
||||
goTo.marker();
|
||||
verify.occurrencesAtPositionCount(1);
|
||||
verify.occurrencesAtPositionCount(0);
|
||||
|
||||
@@ -39,8 +39,6 @@ for (var i = 1; i <= test.markers().length; i++) {
|
||||
verify.occurrencesAtPositionCount(8);
|
||||
break;
|
||||
case 4:
|
||||
case 5:
|
||||
case 8:
|
||||
verify.occurrencesAtPositionCount(1);
|
||||
break;
|
||||
case 6:
|
||||
@@ -48,6 +46,8 @@ for (var i = 1; i <= test.markers().length; i++) {
|
||||
case 9:
|
||||
verify.occurrencesAtPositionCount(8);
|
||||
break;
|
||||
case 5:
|
||||
case 8:
|
||||
case 10:
|
||||
case 11:
|
||||
case 12:
|
||||
|
||||
@@ -143,5 +143,5 @@
|
||||
|
||||
test.markers().forEach(m => {
|
||||
goTo.position(m.position, m.fileName)
|
||||
verify.occurrencesAtPositionCount(1);
|
||||
verify.occurrencesAtPositionCount(0);
|
||||
});
|
||||
|
||||
@@ -36,6 +36,8 @@ for (var i = 1; i <= test.markers().length; i++) {
|
||||
|
||||
switch (i) {
|
||||
case 1:
|
||||
verify.occurrencesAtPositionCount(0);
|
||||
break;
|
||||
case 2:
|
||||
case 3:
|
||||
verify.occurrencesAtPositionCount(1);
|
||||
|
||||
@@ -223,7 +223,7 @@ verify.referencesCountIs(7);
|
||||
|
||||
// References to unresolved symbol.
|
||||
goTo.marker("12");
|
||||
verify.referencesCountIs(1);
|
||||
verify.referencesCountIs(0);
|
||||
|
||||
// References to no context.
|
||||
goTo.marker("13");
|
||||
|
||||
@@ -6,10 +6,10 @@
|
||||
////ba/*4*/r = b/*5*/ar + 1;
|
||||
|
||||
goTo.marker("1");
|
||||
verify.referencesCountIs(1);
|
||||
verify.referencesCountIs(0);
|
||||
|
||||
goTo.marker("2");
|
||||
verify.referencesCountIs(1);
|
||||
verify.referencesCountIs(0);
|
||||
|
||||
goTo.marker("3");
|
||||
verify.referencesCountIs(3);
|
||||
|
||||
@@ -6,4 +6,4 @@
|
||||
////a[/*1*/"blah"];
|
||||
|
||||
goTo.marker("1");
|
||||
verify.referencesCountIs(1);
|
||||
verify.referencesCountIs(0);
|
||||
@@ -9,4 +9,4 @@
|
||||
////}
|
||||
|
||||
goTo.marker("1");
|
||||
verify.referencesCountIs(1);
|
||||
verify.referencesCountIs(0);
|
||||
|
||||
Reference in New Issue
Block a user