Add more isDefinition tests and fix computed property bug

sandersn · sandersn · commit 7bf40c49358e · 2016-06-14T09:39:30.000-07:00
diff --git a/src/services/services.ts b/src/services/services.ts
@@ -6741,7 +6741,7 @@ namespace ts {
                 fileName: node.getSourceFile().fileName,
                 textSpan: createTextSpanFromBounds(start, end),
                 isWriteAccess: isWriteAccess(node),
-                isDefinition: isDeclarationName(node)
+                isDefinition: isDeclarationName(node) || node.parent.kind === SyntaxKind.ComputedPropertyName
             };
         }
 
diff --git a/tests/cases/fourslash/getOccurrencesIsDefinitionOfBindingPattern.ts b/tests/cases/fourslash/getOccurrencesIsDefinitionOfBindingPattern.ts
@@ -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);
+});
diff --git a/tests/cases/fourslash/getOccurrencesIsDefinitionOfComputedProperty.ts b/tests/cases/fourslash/getOccurrencesIsDefinitionOfComputedProperty.ts
@@ -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);
+});
diff --git a/tests/cases/fourslash/getOccurrencesIsDefinitionOfExport.ts b/tests/cases/fourslash/getOccurrencesIsDefinitionOfExport.ts
@@ -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);
+});
diff --git a/tests/cases/fourslash/getOccurrencesIsDefinitionOfNumberNamedProperty.ts b/tests/cases/fourslash/getOccurrencesIsDefinitionOfNumberNamedProperty.ts
@@ -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);
+});
diff --git a/tests/cases/fourslash/getOccurrencesIsDefinitionOfStringNamedProperty.ts b/tests/cases/fourslash/getOccurrencesIsDefinitionOfStringNamedProperty.ts
@@ -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);
+});

Original file line number	Diff line number	Diff line change
`@@ -6741,7 +6741,7 @@ namespace ts {`
`6741`	`6741`	`fileName: node.getSourceFile().fileName,`
`6742`	`6742`	`textSpan: createTextSpanFromBounds(start, end),`
`6743`	`6743`	`isWriteAccess: isWriteAccess(node),`
`6744`		`- isDefinition: isDeclarationName(node)`
	`6744`	`+ isDefinition: isDeclarationName(node) \|\| node.parent.kind === SyntaxKind.ComputedPropertyName`
`6745`	`6745`	`};`
`6746`	`6746`	`}`
`6747`	`6747`