Merge branch 'master' into noImportClauseBuilders

Conflicts:
	src/services/services.ts

tests/cases/fourslash/completionListInObjectBindingPattern01.ts

@@ -10,4 +10,5 @@
 
 goTo.marker();
 verify.completionListContains("property1");
-verify.completionListContains("property2");
+verify.completionListContains("property2");
+verify.not.completionListAllowsNewIdentifier();

tests/cases/fourslash/completionListInObjectBindingPattern02.ts

@@ -10,4 +10,5 @@
 
 goTo.marker();
 verify.completionListContains("property2");
-verify.not.completionListContains("property1");
+verify.not.completionListContains("property1");
+verify.not.completionListAllowsNewIdentifier();

tests/cases/fourslash/completionListInObjectBindingPattern04.ts

@@ -10,4 +10,5 @@
 
 goTo.marker();
 verify.completionListContains("property1");
-verify.completionListContains("property2");
+verify.completionListContains("property2");
+verify.not.completionListAllowsNewIdentifier();

tests/cases/fourslash/completionListInObjectBindingPattern05.ts

@@ -9,4 +9,5 @@
 ////var { property1/**/ } = foo;
 
 goTo.marker();
-verify.completionListContains("property1");
+verify.completionListContains("property1");
+verify.not.completionListAllowsNewIdentifier();

tests/cases/fourslash/completionListInObjectBindingPattern07.ts

@@ -15,4 +15,5 @@
 goTo.marker();
 verify.completionListContains("propertyOfI_1");
 verify.completionListContains("propertyOfI_2");
-verify.not.completionListContains("property2");
+verify.not.completionListContains("property2");
+verify.not.completionListAllowsNewIdentifier();

tests/cases/fourslash/completionListInObjectBindingPattern08.ts

@@ -15,4 +15,5 @@
 goTo.marker();
 verify.completionListContains("propertyOfI_2");
 verify.not.completionListContains("propertyOfI_1");
-verify.not.completionListContains("property2");
+verify.not.completionListContains("property2");
+verify.not.completionListAllowsNewIdentifier();

tests/cases/fourslash/completionListInObjectBindingPattern09.ts

@@ -16,4 +16,5 @@ goTo.marker();
 verify.completionListContains("property2");
 verify.not.completionListContains("property1");
 verify.not.completionListContains("propertyOfI_2");
-verify.not.completionListContains("propertyOfI_1");
+verify.not.completionListContains("propertyOfI_1");
+verify.not.completionListAllowsNewIdentifier();

tests/cases/fourslash/completionListInObjectBindingPattern10.ts

@@ -17,7 +17,9 @@ verify.completionListContains("property2");
 verify.not.completionListContains("property1");
 verify.not.completionListContains("propertyOfI_2");
 verify.not.completionListContains("propertyOfI_1");
+verify.not.completionListAllowsNewIdentifier();
 
 goTo.marker("2");
 verify.completionListContains("property1");
-verify.completionListContains("property2");
+verify.completionListContains("property2");
+verify.not.completionListAllowsNewIdentifier();

tests/cases/fourslash/completionListInObjectBindingPattern11.ts

@@ -10,4 +10,5 @@
 goTo.marker("");
 verify.completionListContains("property2");
 verify.not.completionListContains("property1");
-verify.not.completionListContains("prop1");
+verify.not.completionListContains("prop1");
+verify.not.completionListAllowsNewIdentifier();

tests/cases/fourslash/completionListInObjectBindingPattern12.ts

@@ -10,4 +10,5 @@
 
 goTo.marker("");
 verify.completionListContains("property2");
-verify.not.completionListContains("property1");
+verify.not.completionListContains("property1");
+verify.not.completionListAllowsNewIdentifier();

tests/cases/fourslash/completionListInObjectBindingPattern13.ts

@@ -16,4 +16,5 @@
 goTo.marker();
 verify.completionListContains("x");
 verify.completionListContains("y");
-verify.not.completionListContains("z");
+verify.not.completionListContains("z");
+verify.not.completionListAllowsNewIdentifier();

tests/cases/fourslash/semanticClassificationsCancellation1.ts

@@ -0,0 +1,15 @@
+/// <reference path="fourslash.ts" />
+
+////module M {
+////}
+////module N {
+////}
+
+var c = classification;
+cancellation.setCancelled(1);
+verifyOperationIsCancelled(() => verify.semanticClassificationsAre());
+cancellation.resetCancelled();
+
+verify.semanticClassificationsAre(
+    c.moduleName("M"),
+    c.moduleName("N"));

tests/cases/fourslash/shims/cancellationWhenfindingAllRefsOnDefinition.ts

@@ -1,38 +0,0 @@
-/// <reference path="fourslash.ts" />
-
-//@Filename: findAllRefsOnDefinition-import.ts
-////export class Test{
-////
-////    constructor(){
-////
-////    }
-////
-////    public /*1*/start(){
-////        return this;
-////    }
-////
-////    public stop(){
-////        return this;
-////    }
-////}
-
-//@Filename: findAllRefsOnDefinition.ts
-////import Second = require("findAllRefsOnDefinition-import");
-////
-////var second = new Second.Test()
-////second.start();
-////second.stop();
-
-goTo.file("findAllRefsOnDefinition-import.ts");
-goTo.marker("1");
-
-verify.referencesCountIs(2);
-
-cancellation.setCancelled();
-goTo.marker("1");
-verifyOperationIsCancelled(() => verify.referencesCountIs(0) );
-
-// verify that internal state is still correct
-cancellation.resetCancelled();
-goTo.marker("1");           
-verify.referencesCountIs(2);

tests/cases/fourslash/syntacticClassificationsCancellation1.ts

@@ -0,0 +1,21 @@
+/// <reference path="fourslash.ts" />
+
+////module M {
+////}
+////module N {
+////}
+
+var c = classification;
+cancellation.setCancelled(1);
+verifyOperationIsCancelled(() => verify.syntacticClassificationsAre());
+cancellation.resetCancelled();
+
+verify.syntacticClassificationsAre(
+    c.keyword("module"),
+    c.moduleName("M"),
+    c.punctuation("{"),
+    c.punctuation("}"),
+    c.keyword("module"),
+    c.moduleName("N"),
+    c.punctuation("{"),
+    c.punctuation("}"));