Changes from CR feedback

jramsay · jramsay · commit 62fddba88eeb · 2016-10-04T12:48:44.000-07:00
diff --git a/src/harness/fourslash.ts b/src/harness/fourslash.ts
@@ -756,10 +756,7 @@ namespace FourSlash {
 
         public verifyCompletionListIsGlobal(expected: boolean) {
             const completions = this.getCompletionListAtCaret();
-            if (!completions && expected !== undefined) {
-                this.raiseError(`verifyCompletionListIsGlobal failed - expected result to be ${completions}`);
-            }
-            else if (completions && completions.isGlobalCompletion !== expected) {
+            if (completions && completions.isGlobalCompletion !== expected) {
                 this.raiseError(`verifyCompletionListIsGlobal failed - expected result to be ${completions.isGlobalCompletion}`);
             }
         }
diff --git a/src/services/completions.ts b/src/services/completions.ts
@@ -886,7 +886,7 @@ namespace ts.Completions {
         }
 
         const semanticStart = timestamp();
-        let isGlobalCompletion: boolean;
+        let isGlobalCompletion = false;
         let isMemberCompletion: boolean;
         let isNewIdentifierLocation: boolean;
         let symbols: Symbol[] = [];
@@ -902,7 +902,6 @@ namespace ts.Completions {
             else {
                 symbols = tagSymbols;
             }
-            isGlobalCompletion = false;
             isMemberCompletion = true;
             isNewIdentifierLocation = false;
         }
@@ -913,7 +912,6 @@ namespace ts.Completions {
             if (!typeChecker.isUnknownSymbol(tagSymbol)) {
                 symbols = [tagSymbol];
             }
-            isGlobalCompletion = false;
             isMemberCompletion = true;
             isNewIdentifierLocation = false;
         }
diff --git a/tests/cases/fourslash/completionListIsGlobalCompletion.ts b/tests/cases/fourslash/completionListIsGlobalCompletion.ts
@@ -23,17 +23,17 @@
 goTo.marker("1");
 verify.completionListIsGlobal(false);
 goTo.marker("2");
-verify.completionListIsGlobal(undefined);
+verify.completionListIsGlobal(false);
 goTo.marker("3");
-verify.completionListIsGlobal(undefined);
+verify.completionListIsGlobal(false);
 goTo.marker("4");
 verify.completionListIsGlobal(true);
 goTo.marker("5");
-verify.completionListIsGlobal(undefined);
+verify.completionListIsGlobal(false);
 goTo.marker("6");
 verify.completionListIsGlobal(true);
 goTo.marker("7");
-verify.completionListIsGlobal(undefined);
+verify.completionListIsGlobal(false);
 goTo.marker("8");
 verify.completionListIsGlobal(false);
 goTo.marker("9");

Original file line number	Diff line number	Diff line change
`@@ -756,10 +756,7 @@ namespace FourSlash {`
`756`	`756`
`757`	`757`	`public verifyCompletionListIsGlobal(expected: boolean) {`
`758`	`758`	`const completions = this.getCompletionListAtCaret();`
`759`		`- if (!completions && expected !== undefined) {`
`760`		- this.raiseError(`verifyCompletionListIsGlobal failed - expected result to be ${completions}`);
`761`		`- }`
`762`		`- else if (completions && completions.isGlobalCompletion !== expected) {`
	`759`	`+ if (completions && completions.isGlobalCompletion !== expected) {`
`763`	`760`	this.raiseError(`verifyCompletionListIsGlobal failed - expected result to be ${completions.isGlobalCompletion}`);
`764`	`761`	`}`
`765`	`762`	`}`
Original file line number	Diff line number	Diff line change
`@@ -886,7 +886,7 @@ namespace ts.Completions {`
`886`	`886`	`}`
`887`	`887`
`888`	`888`	`const semanticStart = timestamp();`
`889`		`- let isGlobalCompletion: boolean;`
	`889`	`+ let isGlobalCompletion = false;`
`890`	`890`	`let isMemberCompletion: boolean;`
`891`	`891`	`let isNewIdentifierLocation: boolean;`
`892`	`892`	`let symbols: Symbol[] = [];`
`@@ -902,7 +902,6 @@ namespace ts.Completions {`
`902`	`902`	`else {`
`903`	`903`	`symbols = tagSymbols;`
`904`	`904`	`}`
`905`		`- isGlobalCompletion = false;`
`906`	`905`	`isMemberCompletion = true;`
`907`	`906`	`isNewIdentifierLocation = false;`
`908`	`907`	`}`
`@@ -913,7 +912,6 @@ namespace ts.Completions {`
`913`	`912`	`if (!typeChecker.isUnknownSymbol(tagSymbol)) {`
`914`	`913`	`symbols = [tagSymbol];`
`915`	`914`	`}`
`916`		`- isGlobalCompletion = false;`
`917`	`915`	`isMemberCompletion = true;`
`918`	`916`	`isNewIdentifierLocation = false;`
`919`	`917`	`}`