Less aggresive completion list

src/harness/fourslash.ts

@@ -662,7 +662,16 @@ module FourSlash {
 
                 Harness.IO.log(errorMsg);
                 this.raiseError("Completion list is not empty at Caret");
+            }
+        }
+
+        public verifyCompletionListAllowsNewIdentifier(negative: boolean) {
+            var completions = this.getCompletionListAtCaret();
 
+            if ((completions && !completions.isNewIdentifierLocation) && !negative) {
+                this.raiseError("Expected builder completion entry");
+            } else if ((completions && completions.isNewIdentifierLocation) && negative) {
+                this.raiseError("Un-expected builder completion entry");
             }
         }
 

tests/baselines/reference/APISample_compile.js

@@ -1694,6 +1694,7 @@ declare module "typescript" {
     }
     interface CompletionInfo {
         isMemberCompletion: boolean;
+        isNewIdentifierLocation: boolean;
         entries: CompletionEntry[];
     }
     interface CompletionEntry {

tests/baselines/reference/APISample_compile.types

@@ -5464,6 +5464,9 @@ declare module "typescript" {
         isMemberCompletion: boolean;
 >isMemberCompletion : boolean
 
+        isNewIdentifierLocation: boolean;
+>isNewIdentifierLocation : boolean
+
         entries: CompletionEntry[];
 >entries : CompletionEntry[]
 >CompletionEntry : CompletionEntry

tests/baselines/reference/APISample_linter.js

@@ -1723,6 +1723,7 @@ declare module "typescript" {
     }
     interface CompletionInfo {
         isMemberCompletion: boolean;
+        isNewIdentifierLocation: boolean;
         entries: CompletionEntry[];
     }
     interface CompletionEntry {

tests/baselines/reference/APISample_linter.types

@@ -5594,6 +5594,9 @@ declare module "typescript" {
         isMemberCompletion: boolean;
 >isMemberCompletion : boolean
 
+        isNewIdentifierLocation: boolean;
+>isNewIdentifierLocation : boolean
+
         entries: CompletionEntry[];
 >entries : CompletionEntry[]
 >CompletionEntry : CompletionEntry

tests/baselines/reference/APISample_transform.js

@@ -1724,6 +1724,7 @@ declare module "typescript" {
     }
     interface CompletionInfo {
         isMemberCompletion: boolean;
+        isNewIdentifierLocation: boolean;
         entries: CompletionEntry[];
     }
     interface CompletionEntry {

tests/baselines/reference/APISample_transform.types

@@ -5542,6 +5542,9 @@ declare module "typescript" {
         isMemberCompletion: boolean;
 >isMemberCompletion : boolean
 
+        isNewIdentifierLocation: boolean;
+>isNewIdentifierLocation : boolean
+
         entries: CompletionEntry[];
 >entries : CompletionEntry[]
 >CompletionEntry : CompletionEntry

tests/baselines/reference/APISample_watcher.js

@@ -1761,6 +1761,7 @@ declare module "typescript" {
     }
     interface CompletionInfo {
         isMemberCompletion: boolean;
+        isNewIdentifierLocation: boolean;
         entries: CompletionEntry[];
     }
     interface CompletionEntry {

tests/baselines/reference/APISample_watcher.types

@@ -5720,6 +5720,9 @@ declare module "typescript" {
         isMemberCompletion: boolean;
 >isMemberCompletion : boolean
 
+        isNewIdentifierLocation: boolean;
+>isNewIdentifierLocation : boolean
+
         entries: CompletionEntry[];
 >entries : CompletionEntry[]
 >CompletionEntry : CompletionEntry

tests/cases/fourslash/completionListAtIdentifierDefinitionLocations_Generics.ts

@@ -0,0 +1,18 @@
+/// <reference path='fourslash.ts' />
+
+////interface A</*genericName1*/
+
+////class A</*genericName2*/
+
+////class B<T, /*genericName3*/
+
+////class A{
+////     f</*genericName4*/
+
+////function A</*genericName5*/
+
+
+test.markers().forEach((m) => {
+    goTo.position(m.position, m.fileName);
+    verify.completionListIsEmpty();
+});

tests/cases/fourslash/completionListAtIdentifierDefinitionLocations_destructuring.ts

@@ -0,0 +1,22 @@
+/// <reference path='fourslash.ts' />
+
+//// var [x/*variable1*/
+
+//// var [x, y/*variable2*/
+
+//// var [./*variable3*/
+
+//// var [x, ...z/*variable4*/
+
+//// var {x/*variable5*/
+
+//// var {x, y/*variable6*/
+
+//// function func1({ a/*parameter1*/
+
+//// function func2({ a, b/*parameter2*/
+
+test.markers().forEach((m) => {
+    goTo.position(m.position, m.fileName);
+    verify.completionListIsEmpty();
+});

tests/cases/fourslash/completionListAtIdentifierDefinitionLocations_parameters.ts

@@ -10,23 +10,17 @@
 
 ////function testFunction(a, b/*parameterName4*/
 
-////class bar1{ constructor(/*constructorParamter1*/
+////class bar5{ constructor(public /*constructorParamter1*/
 
-////class bar2{ constructor(a/*constructorParamter2*/
+////class bar6{ constructor(public a/*constructorParamter2*/
 
-////class bar3{ constructor(a, /*constructorParamter3*/
+////class bar7{ constructor(protected a/*constructorParamter3*/
 
-////class bar4{ constructor(a, b/*constructorParamter4*/
+////class bar8{ constructor(private a/*constructorParamter4*/
 
-////class bar5{ constructor(public /*constructorParamter5*/
+////class bar9{ constructor(.../*constructorParamter5*/
 
-////class bar6{ constructor(public a/*constructorParamter6*/
-
-////class bar7{ constructor(private a/*constructorParamter7*/
-
-////class bar8{ constructor(.../*constructorParamter8*/
-
-////class bar9{ constructor(...a/*constructorParamter9*/
+////class bar10{ constructor(...a/*constructorParamter6*/
 
 
 test.markers().forEach((m) => {

tests/cases/fourslash/completionListAtIdentifierDefinitionLocations_properties.ts

@@ -0,0 +1,37 @@
+/// <reference path='fourslash.ts' />
+
+////var aa = 1;
+
+////class A1 {
+////    /*property1*/
+////}
+
+////class A2 {
+////    p/*property2*/
+////}
+
+////class A3 {
+////    public s/*property3*/
+////}
+
+////class A4 {
+////    a/*property4*/
+////}
+
+////class A5 {
+////    public a/*property5*/
+////}
+
+////class A6 {
+////    protected a/*property6*/
+////}
+
+////class A7 {
+////    private a/*property7*/
+////}
+
+test.markers().forEach((m) => {
+    goTo.position(m.position, m.fileName);
+    verify.not.completionListIsEmpty();
+    verify.completionListAllowsNewIdentifier();
+});

tests/cases/fourslash/completionListAtIdentifierDefinitionLocations_varDeclarations.ts

@@ -11,7 +11,6 @@
 
 ////var a2, a/*varName4*/
 
-debugger;
 test.markers().forEach((m) => {
     goTo.position(m.position, m.fileName);
     verify.completionListIsEmpty();

tests/cases/fourslash/completionListBuilderLocations_Modules.ts

@@ -0,0 +1,13 @@
+/// <reference path='fourslash.ts' />
+
+////module A/*moduleName1*/
+
+
+////module A./*moduleName2*/
+
+
+test.markers().forEach((m) => {
+    goTo.position(m.position, m.fileName);
+    verify.not.completionListIsEmpty();
+    verify.completionListAllowsNewIdentifier();
+});

tests/cases/fourslash/completionListBuilderLocations_VariableDeclarations.ts

@@ -0,0 +1,34 @@
+/// <reference path='fourslash.ts' />
+
+////var x = a/*var1*/
+
+////var x = (b/*var2*/
+
+////var x = (c, d/*var3*/
+
+//// var y : any = "", x = a/*var4*/
+
+//// var y : any = "", x = (a/*var5*/
+
+////class C{}
+////var y = new C( 
+
+//// class C{}
+//// var y = new C(0, /*var7*/
+
+////var y = [/*var8*/
+
+////var y = [0, /*var9*/
+
+////var y = `${/*var10*/
+
+////var y = `${10} dd ${ /*var11*/
+
+////var y = 10; y=/*var12*/
+
+test.markers().forEach((m) => {
+    goTo.position(m.position, m.fileName);
+    verify.completionListAllowsNewIdentifier();
+});
+
+

tests/cases/fourslash/completionListBuilderLocations_parameters.ts

@@ -0,0 +1,22 @@
+/// <reference path='fourslash.ts' />
+
+////var aa = 1;
+
+////class bar1{ constructor(/*constructorParamter1*/
+
+////class bar2{ constructor(a/*constructorParamter2*/
+
+////class bar3{ constructor(a, /*constructorParamter3*/
+
+////class bar4{ constructor(a, b/*constructorParamter4*/
+
+////class bar6{ constructor(public a, /*constructorParamter5*/
+
+////class bar7{ constructor(private a, /*constructorParamter6*/
+
+
+test.markers().forEach((m) => {
+    goTo.position(m.position, m.fileName);
+    verify.not.completionListIsEmpty();
+    verify.completionListAllowsNewIdentifier();
+});

tests/cases/fourslash/completionListAtIdentifierDefinitionLocations_modules.ts → tests/cases/fourslash/completionListBuilderLocations_properties.ts

@@ -2,12 +2,15 @@
 
 ////var aa = 1;
 
-////module /*moduleName1*/
-
-////module a/*moduleName2*/
+////class A1 {
+////    public static /*property1*/
+////}
 
+////class A2 {
+////    public static a/*property2*/
+////}
 
 test.markers().forEach((m) => {
     goTo.position(m.position, m.fileName);
     verify.completionListIsEmpty();
-});
+});

tests/cases/fourslash/fourslash.ts

@@ -172,6 +172,10 @@ module FourSlashInterface {
             FourSlash.currentTestState.verifyCompletionListIsEmpty(this.negative);
         }
 
+        public completionListAllowsNewIdentifier() {
+            FourSlash.currentTestState.verifyCompletionListAllowsNewIdentifier(this.negative);
+        }
+
         public memberListIsEmpty() {
             FourSlash.currentTestState.verifyMemberListIsEmpty(this.negative);
         }