Merge branch 'master' into find_all_refs_primitive

Author: Andy Hanson

src/compiler/checker.ts

@@ -4172,7 +4172,6 @@ namespace ts {
         }
 
         function getDeclaredTypeOfSymbol(symbol: Symbol): Type {
-            Debug.assert((symbol.flags & SymbolFlags.Instantiated) === 0);
             if (symbol.flags & (SymbolFlags.Class | SymbolFlags.Interface)) {
                 return getDeclaredTypeOfClassOrInterface(symbol);
             }

src/compiler/core.ts

@@ -24,7 +24,9 @@ namespace ts {
     }
 
     // More efficient to create a collator once and use its `compare` than to call `a.localeCompare(b)` many times.
-    export const collator: { compare(a: string, b: string): number } = typeof Intl === "object" && typeof Intl.Collator === "function" ? new Intl.Collator() : undefined;
+    export const collator: { compare(a: string, b: string): number } = typeof Intl === "object" && typeof Intl.Collator === "function" ? new Intl.Collator(/*locales*/ undefined, { usage: "sort", sensitivity: "accent" }) : undefined;
+    // Intl is missing in Safari, and node 0.10 treats "a" as greater than "B".
+    export const localeCompareIsCorrect = ts.collator && ts.collator.compare("a", "B") < 0;
 
     /** Create a MapLike with good performance. */
     function createDictionaryObject<T>(): MapLike<T> {
@@ -1247,9 +1249,12 @@ namespace ts {
         if (a === undefined) return Comparison.LessThan;
         if (b === undefined) return Comparison.GreaterThan;
         if (ignoreCase) {
-            if (collator && String.prototype.localeCompare) {
-                // accent means a ≠ b, a ≠ á, a = A
-                const result = a.localeCompare(b, /*locales*/ undefined, { usage: "sort", sensitivity: "accent" });
+            // Checking if "collator exists indicates that Intl is available.
+            // We still have to check if "collator.compare" is correct. If it is not, use "String.localeComapre"
+            if (collator) {
+                const result = localeCompareIsCorrect ?
+                    collator.compare(a, b) :
+                    a.localeCompare(b, /*locales*/ undefined, { usage: "sort", sensitivity: "accent" });  // accent means a ≠ b, a ≠ á, a = A
                 return result < 0 ? Comparison.LessThan : result > 0 ? Comparison.GreaterThan : Comparison.EqualTo;
             }
 

src/harness/fourslash.ts

@@ -372,8 +372,8 @@ namespace FourSlash {
         }
 
         // Entry points from fourslash.ts
-        public goToMarker(name = "") {
-            const marker = this.getMarkerByName(name);
+        public goToMarker(name: string | Marker = "") {
+            const marker = typeof name === "string" ? this.getMarkerByName(name) : name;
             if (this.activeFile.fileName !== marker.fileName) {
                 this.openFile(marker.fileName);
             }
@@ -382,10 +382,37 @@ namespace FourSlash {
             if (marker.position === -1 || marker.position > content.length) {
                 throw new Error(`Marker "${name}" has been invalidated by unrecoverable edits to the file.`);
             }
-            this.lastKnownMarker = name;
+            const mName = typeof name === "string" ? name : this.markerName(marker);
+            this.lastKnownMarker = mName;
             this.goToPosition(marker.position);
         }
 
+        public goToEachMarker(action: () => void) {
+            const markers = this.getMarkers();
+            assert(markers.length);
+            for (const marker of markers) {
+                this.goToMarker(marker);
+                action();
+            }
+        }
+
+        public goToEachRange(action: () => void) {
+            const ranges = this.getRanges();
+            assert(ranges.length);
+            for (const range of ranges) {
+                this.goToRangeStart(range);
+                action();
+            }
+        }
+
+        private markerName(m: Marker): string {
+            return ts.forEachEntry(this.testData.markerPositions, (marker, name) => {
+                if (marker === m) {
+                    return name;
+                }
+            })!;
+        }
+
         public goToPosition(pos: number) {
             this.currentCaretPosition = pos;
         }
@@ -2365,6 +2392,21 @@ namespace FourSlash {
             return this.languageService.getDocumentHighlights(this.activeFile.fileName, this.currentCaretPosition, filesToSearch);
         }
 
+        public verifyRangesAreOccurrences(isWriteAccess?: boolean) {
+            const ranges = this.getRanges();
+            for (const r of ranges) {
+                this.goToRangeStart(r);
+                this.verifyOccurrencesAtPositionListCount(ranges.length);
+                for (const range of ranges) {
+                    this.verifyOccurrencesAtPositionListContains(range.fileName, range.start, range.end, isWriteAccess);
+                }
+            }
+        }
+
+        public verifyRangesAreRenameLocations(findInStrings: boolean, findInComments: boolean) {
+            this.goToEachRange(() => this.verifyRenameLocations(findInStrings, findInComments));
+        }
+
         public verifyRangesWithSameTextAreDocumentHighlights() {
             this.rangesByText().forEach(ranges => this.verifyRangesAreDocumentHighlights(ranges));
         }
@@ -3078,14 +3120,22 @@ namespace FourSlashInterface {
         // Moves the caret to the specified marker,
         // or the anonymous marker ('/**/') if no name
         // is given
-        public marker(name?: string) {
+        public marker(name?: string | FourSlash.Marker) {
             this.state.goToMarker(name);
         }
 
+        public eachMarker(action: () => void) {
+            this.state.goToEachMarker(action);
+        }
+
         public rangeStart(range: FourSlash.Range) {
             this.state.goToRangeStart(range);
         }
 
+        public eachRange(action: () => void) {
+            this.state.goToEachRange(action);
+        }
+
         public bof() {
             this.state.goToBOF();
         }
@@ -3436,6 +3486,14 @@ namespace FourSlashInterface {
             this.state.verifyOccurrencesAtPositionListCount(expectedCount);
         }
 
+        public rangesAreOccurrences(isWriteAccess?: boolean) {
+            this.state.verifyRangesAreOccurrences(isWriteAccess);
+        }
+
+        public rangesAreRenameLocations(findInStrings = false, findInComments = false) {
+            this.state.verifyRangesAreRenameLocations(findInStrings, findInComments);
+        }
+
         public rangesAreDocumentHighlights(ranges?: FourSlash.Range[]) {
             this.state.verifyRangesAreDocumentHighlights(ranges);
         }

src/services/navigationBar.ts

@@ -322,34 +322,14 @@ namespace ts.NavigationBar {
     function compareChildren(child1: NavigationBarNode, child2: NavigationBarNode): number {
         const name1 = tryGetName(child1.node), name2 = tryGetName(child2.node);
         if (name1 && name2) {
-            const cmp = localeCompareFix(name1, name2);
+            const cmp = ts.compareStringsCaseInsensitive(name1, name2);
             return cmp !== 0 ? cmp : navigationBarNodeKind(child1) - navigationBarNodeKind(child2);
         }
         else {
             return name1 ? 1 : name2 ? -1 : navigationBarNodeKind(child1) - navigationBarNodeKind(child2);
         }
     }
 
-    // Intl is missing in Safari, and node 0.10 treats "a" as greater than "B".
-    const localeCompareIsCorrect = ts.collator && ts.collator.compare("a", "B") < 0;
-    const localeCompareFix: (a: string, b: string) => number = localeCompareIsCorrect ? collator.compare : function(a, b) {
-        // This isn't perfect, but it passes all of our tests.
-        for (let i = 0; i < Math.min(a.length, b.length); i++) {
-            const chA = a.charAt(i), chB = b.charAt(i);
-            if (chA === "\"" && chB === "'") {
-                return 1;
-            }
-            if (chA === "'" && chB === "\"") {
-                return -1;
-            }
-            const cmp = ts.compareStrings(chA.toLocaleLowerCase(), chB.toLocaleLowerCase());
-            if (cmp !== 0) {
-                return cmp;
-            }
-        }
-        return a.length - b.length;
-    };
-
     /**
      * This differs from getItemName because this is just used for sorting.
      * We only sort nodes by name that have a more-or-less "direct" name, as opposed to `new()` and the like.

tests/baselines/reference/mergedDeclarations7.errors.txt

@@ -0,0 +1,32 @@
+tests/cases/compiler/test.ts(4,5): error TS2322: Type 'PassportStatic' is not assignable to type 'Passport'.
+  Types of property 'use' are incompatible.
+    Type '() => PassportStatic' is not assignable to type '() => this'.
+      Type 'PassportStatic' is not assignable to type 'this'.
+
+
+==== tests/cases/compiler/passport.d.ts (0 errors) ====
+    declare module 'passport' {
+        namespace passport {
+            interface Passport {
+                use(): this;
+            }
+    
+            interface PassportStatic extends Passport {
+                Passport: {new(): Passport};
+            }
+        }
+    
+        const passport: passport.PassportStatic;
+        export = passport;
+    }
+    
+==== tests/cases/compiler/test.ts (1 errors) ====
+    import * as passport from "passport";
+    import { Passport } from "passport";
+    
+    let p: Passport = passport.use();
+        ~
+!!! error TS2322: Type 'PassportStatic' is not assignable to type 'Passport'.
+!!! error TS2322:   Types of property 'use' are incompatible.
+!!! error TS2322:     Type '() => PassportStatic' is not assignable to type '() => this'.
+!!! error TS2322:       Type 'PassportStatic' is not assignable to type 'this'.

tests/baselines/reference/mergedDeclarations7.js

@@ -0,0 +1,28 @@
+//// [tests/cases/compiler/mergedDeclarations7.ts] ////
+
+//// [passport.d.ts]
+declare module 'passport' {
+    namespace passport {
+        interface Passport {
+            use(): this;
+        }
+
+        interface PassportStatic extends Passport {
+            Passport: {new(): Passport};
+        }
+    }
+
+    const passport: passport.PassportStatic;
+    export = passport;
+}
+
+//// [test.ts]
+import * as passport from "passport";
+import { Passport } from "passport";
+
+let p: Passport = passport.use();
+
+//// [test.js]
+"use strict";
+var passport = require("passport");
+var p = passport.use();

tests/cases/compiler/mergedDeclarations7.ts

@@ -0,0 +1,21 @@
+// @filename: passport.d.ts
+declare module 'passport' {
+    namespace passport {
+        interface Passport {
+            use(): this;
+        }
+
+        interface PassportStatic extends Passport {
+            Passport: {new(): Passport};
+        }
+    }
+
+    const passport: passport.PassportStatic;
+    export = passport;
+}
+
+//@filename: test.ts
+import * as passport from "passport";
+import { Passport } from "passport";
+
+let p: Passport = passport.use();

tests/cases/fourslash/completionListAtIdentifierDefinitionLocations_Generics.ts

@@ -11,8 +11,4 @@
 
 ////function A</*genericName5*/
 
-
-test.markers().forEach((m) => {
-    goTo.position(m.position, m.fileName);
-    verify.completionListIsEmpty();
-});
+goTo.eachMarker(() => verify.completionListIsEmpty());

tests/cases/fourslash/completionListAtIdentifierDefinitionLocations_catch.ts

@@ -6,8 +6,4 @@
 
 //// try {} catch(a/*catchVariable2*/
 
-
-test.markers().forEach((m) => {
-    goTo.position(m.position, m.fileName);
-    verify.completionListIsEmpty();
-});
+goTo.eachMarker(() => verify.completionListIsEmpty());

tests/cases/fourslash/completionListAtIdentifierDefinitionLocations_classes.ts

@@ -6,7 +6,4 @@
 
 ////class a/*className2*/
 
-test.markers().forEach((m) => {
-    goTo.position(m.position, m.fileName);
-    verify.completionListIsEmpty();
-});
+goTo.eachMarker(() => verify.completionListIsEmpty());

tests/cases/fourslash/completionListAtIdentifierDefinitionLocations_destructuring.ts

@@ -16,7 +16,4 @@
 
 //// function func2({ a, b/*parameter2*/
 
-test.markers().forEach(m => {
-    goTo.position(m.position, m.fileName);
-    verify.completionListIsEmpty();
-});
+goTo.eachMarker(() => verify.completionListIsEmpty());

tests/cases/fourslash/completionListAtIdentifierDefinitionLocations_enumMembers.ts

@@ -4,8 +4,4 @@
 
 ////enum a { /*enumValueName1*/
 
-
-test.markers().forEach((m) => {
-    goTo.position(m.position, m.fileName);
-    verify.completionListIsEmpty();
-});
+goTo.eachMarker(() => verify.completionListIsEmpty());

tests/cases/fourslash/completionListAtIdentifierDefinitionLocations_enumMembers2.ts

@@ -3,7 +3,4 @@
 ////var aa = 1;
 ////enum a { foo, /*enumValueName3*/
 
-test.markers().forEach((m) => {
-    goTo.position(m.position, m.fileName);
-    verify.completionListIsEmpty();
-});
+goTo.eachMarker(() => verify.completionListIsEmpty());

tests/cases/fourslash/completionListAtIdentifierDefinitionLocations_enums.ts

@@ -8,7 +8,4 @@
 
 ////var x = 0; enum /*enumName4*/
 
-test.markers().forEach((m) => {
-    goTo.position(m.position, m.fileName);
-    verify.completionListIsEmpty();
-});
+goTo.eachMarker(() => verify.completionListIsEmpty());

tests/cases/fourslash/completionListAtIdentifierDefinitionLocations_functions.ts

@@ -6,8 +6,4 @@
 
 ////function a/*functionName2*/
 
-
-test.markers().forEach((m) => {
-    goTo.position(m.position, m.fileName);
-    verify.completionListIsEmpty();
-});
+goTo.eachMarker(() => verify.completionListIsEmpty());

tests/cases/fourslash/completionListAtIdentifierDefinitionLocations_interfaceMembers.ts

@@ -4,7 +4,4 @@
 
 ////interface a { /*interfaceValue1*/
 
-test.markers().forEach((m) => {
-    goTo.position(m.position, m.fileName);
-    verify.completionListIsEmpty();
-});
+goTo.eachMarker(() => verify.completionListIsEmpty());

tests/cases/fourslash/completionListAtIdentifierDefinitionLocations_interfaceMembers2.ts

@@ -4,7 +4,4 @@
 
 ////interface a { f/*interfaceValue2*/
 
-test.markers().forEach((m) => {
-    goTo.position(m.position, m.fileName);
-    verify.completionListIsEmpty();
-});
+goTo.eachMarker(() => verify.completionListIsEmpty());

tests/cases/fourslash/completionListAtIdentifierDefinitionLocations_interfaceMembers3.ts

@@ -4,7 +4,4 @@
 
 ////interface a { f; /*interfaceValue3*/
 
-test.markers().forEach((m) => {
-    goTo.position(m.position, m.fileName);
-    verify.completionListIsEmpty();
-});
+goTo.eachMarker(() => verify.completionListIsEmpty());

tests/cases/fourslash/completionListAtIdentifierDefinitionLocations_interfaces.ts

@@ -6,8 +6,4 @@
 
 ////interface a/*interfaceName2*/
 
-
-test.markers().forEach((m) => {
-    goTo.position(m.position, m.fileName);
-    verify.completionListIsEmpty();
-});
+goTo.eachMarker(() => verify.completionListIsEmpty());

tests/cases/fourslash/completionListAtIdentifierDefinitionLocations_parameters.ts

@@ -22,8 +22,4 @@
 
 ////class bar10{ constructor(...a/*constructorParamter6*/
 
-
-test.markers().forEach((m) => {
-    goTo.position(m.position, m.fileName);
-    verify.completionListIsEmpty();
-});
+goTo.eachMarker(() => verify.completionListIsEmpty());