Fix reordering files when the override method is called by super class.

domchen · domchen · commit 02cd4d94518a · 2018-10-30T10:52:39.000+08:00
diff --git a/lib/tsc.js b/lib/tsc.js
@@ -61,7 +61,7 @@ var ts;
 (function (ts) {
     ts.versionMajorMinor = "3.1";
     ts.version = ts.versionMajorMinor + ".3";
-    ts.version_plus = "3.1.4";
+    ts.version_plus = "3.1.5";
 })(ts || (ts = {}));
 (function (ts) {
     ts.emptyArray = [];
@@ -65190,14 +65190,14 @@ var ts;
         }
     }
     function checkClassInstantiation(node) {
-        var superMethodNames = [];
+        var methodNames = [];
         var superClass = ts.getClassExtendsHeritageElement(node);
         if (superClass) {
             var type = checker.getTypeAtLocation(superClass);
             if (type && type.symbol) {
                 var declaration = ts.getDeclarationOfKind(type.symbol, 238);
                 if (declaration) {
-                    superMethodNames = checkClassInstantiation(declaration);
+                    methodNames = checkClassInstantiation(declaration);
                 }
             }
         }
@@ -65213,7 +65213,7 @@ var ts;
             }
             if (member.kind === 154) {
                 var methodName = ts.unescapeLeadingUnderscores(ts.getTextOfPropertyName(member.name));
-                if (superMethodNames.indexOf(methodName) != -1) {
+                if (methodNames.indexOf(methodName) != -1) {
                     visitBlock(member.body);
                 }
             }
@@ -65226,7 +65226,6 @@ var ts;
                 visitBlock(constructor.body);
             }
         }
-        var methodNames = [];
         for (var i = index; i < calledMethods.length; i++) {
             var method = calledMethods[i];
             for (var _a = 0, members_9 = members; _a < members_9.length; _a++) {
diff --git a/lib/tsserver.js b/lib/tsserver.js
@@ -89,7 +89,7 @@ var ts;
     ts.versionMajorMinor = "3.1";
     /** The version of the TypeScript compiler release */
     ts.version = ts.versionMajorMinor + ".3";
-    ts.version_plus = "3.1.4";
+    ts.version_plus = "3.1.5";
 })(ts || (ts = {}));
 (function (ts) {
     /* @internal */
@@ -80472,14 +80472,14 @@ var ts;
         }
     }
     function checkClassInstantiation(node) {
-        var superMethodNames = [];
+        var methodNames = [];
         var superClass = ts.getClassExtendsHeritageElement(node);
         if (superClass) {
             var type = checker.getTypeAtLocation(superClass);
             if (type && type.symbol) {
                 var declaration = ts.getDeclarationOfKind(type.symbol, 238 /* ClassDeclaration */);
                 if (declaration) {
-                    superMethodNames = checkClassInstantiation(declaration);
+                    methodNames = checkClassInstantiation(declaration);
                 }
             }
         }
@@ -80495,7 +80495,7 @@ var ts;
             }
             if (member.kind === 154 /* MethodDeclaration */) { // called by super class.
                 var methodName = ts.unescapeLeadingUnderscores(ts.getTextOfPropertyName(member.name));
-                if (superMethodNames.indexOf(methodName) != -1) {
+                if (methodNames.indexOf(methodName) != -1) {
                     visitBlock(member.body);
                 }
             }
@@ -80508,7 +80508,6 @@ var ts;
                 visitBlock(constructor.body);
             }
         }
-        var methodNames = [];
         for (var i = index; i < calledMethods.length; i++) {
             var method = calledMethods[i];
             for (var _a = 0, members_9 = members; _a < members_9.length; _a++) {
diff --git a/lib/tsserverlibrary.d.ts b/lib/tsserverlibrary.d.ts
@@ -17,7 +17,7 @@ declare namespace ts {
     const versionMajorMinor = "3.1";
     /** The version of the TypeScript compiler release */
     const version: string;
-    const version_plus = "3.1.4";
+    const version_plus = "3.1.5";
 }
 declare namespace ts {
     /**
diff --git a/lib/tsserverlibrary.js b/lib/tsserverlibrary.js
@@ -85,7 +85,7 @@ var ts;
     ts.versionMajorMinor = "3.1";
     /** The version of the TypeScript compiler release */
     ts.version = ts.versionMajorMinor + ".3";
-    ts.version_plus = "3.1.4";
+    ts.version_plus = "3.1.5";
 })(ts || (ts = {}));
 (function (ts) {
     /* @internal */
@@ -80468,14 +80468,14 @@ var ts;
         }
     }
     function checkClassInstantiation(node) {
-        var superMethodNames = [];
+        var methodNames = [];
         var superClass = ts.getClassExtendsHeritageElement(node);
         if (superClass) {
             var type = checker.getTypeAtLocation(superClass);
             if (type && type.symbol) {
                 var declaration = ts.getDeclarationOfKind(type.symbol, 238 /* ClassDeclaration */);
                 if (declaration) {
-                    superMethodNames = checkClassInstantiation(declaration);
+                    methodNames = checkClassInstantiation(declaration);
                 }
             }
         }
@@ -80491,7 +80491,7 @@ var ts;
             }
             if (member.kind === 154 /* MethodDeclaration */) { // called by super class.
                 var methodName = ts.unescapeLeadingUnderscores(ts.getTextOfPropertyName(member.name));
-                if (superMethodNames.indexOf(methodName) != -1) {
+                if (methodNames.indexOf(methodName) != -1) {
                     visitBlock(member.body);
                 }
             }
@@ -80504,7 +80504,6 @@ var ts;
                 visitBlock(constructor.body);
             }
         }
-        var methodNames = [];
         for (var i = index; i < calledMethods.length; i++) {
             var method = calledMethods[i];
             for (var _a = 0, members_9 = members; _a < members_9.length; _a++) {
diff --git a/lib/typescript.d.ts b/lib/typescript.d.ts
@@ -17,7 +17,7 @@ declare namespace ts {
     const versionMajorMinor = "3.1";
     /** The version of the TypeScript compiler release */
     const version: string;
-    const version_plus = "3.1.4";
+    const version_plus = "3.1.5";
 }
 declare namespace ts {
     /**
diff --git a/lib/typescript.js b/lib/typescript.js
@@ -76,7 +76,7 @@ var ts;
     ts.versionMajorMinor = "3.1";
     /** The version of the TypeScript compiler release */
     ts.version = ts.versionMajorMinor + ".3";
-    ts.version_plus = "3.1.4";
+    ts.version_plus = "3.1.5";
 })(ts || (ts = {}));
 (function (ts) {
     /* @internal */
@@ -80459,14 +80459,14 @@ var ts;
         }
     }
     function checkClassInstantiation(node) {
-        var superMethodNames = [];
+        var methodNames = [];
         var superClass = ts.getClassExtendsHeritageElement(node);
         if (superClass) {
             var type = checker.getTypeAtLocation(superClass);
             if (type && type.symbol) {
                 var declaration = ts.getDeclarationOfKind(type.symbol, 238 /* ClassDeclaration */);
                 if (declaration) {
-                    superMethodNames = checkClassInstantiation(declaration);
+                    methodNames = checkClassInstantiation(declaration);
                 }
             }
         }
@@ -80482,7 +80482,7 @@ var ts;
             }
             if (member.kind === 154 /* MethodDeclaration */) { // called by super class.
                 var methodName = ts.unescapeLeadingUnderscores(ts.getTextOfPropertyName(member.name));
-                if (superMethodNames.indexOf(methodName) != -1) {
+                if (methodNames.indexOf(methodName) != -1) {
                     visitBlock(member.body);
                 }
             }
@@ -80495,7 +80495,6 @@ var ts;
                 visitBlock(constructor.body);
             }
         }
-        var methodNames = [];
         for (var i = index; i < calledMethods.length; i++) {
             var method = calledMethods[i];
             for (var _a = 0, members_9 = members; _a < members_9.length; _a++) {
diff --git a/lib/typescriptServices.d.ts b/lib/typescriptServices.d.ts
@@ -17,7 +17,7 @@ declare namespace ts {
     const versionMajorMinor = "3.1";
     /** The version of the TypeScript compiler release */
     const version: string;
-    const version_plus = "3.1.4";
+    const version_plus = "3.1.5";
 }
 declare namespace ts {
     /**
diff --git a/lib/typescriptServices.js b/lib/typescriptServices.js
@@ -76,7 +76,7 @@ var ts;
     ts.versionMajorMinor = "3.1";
     /** The version of the TypeScript compiler release */
     ts.version = ts.versionMajorMinor + ".3";
-    ts.version_plus = "3.1.4";
+    ts.version_plus = "3.1.5";
 })(ts || (ts = {}));
 (function (ts) {
     /* @internal */
@@ -80459,14 +80459,14 @@ var ts;
         }
     }
     function checkClassInstantiation(node) {
-        var superMethodNames = [];
+        var methodNames = [];
         var superClass = ts.getClassExtendsHeritageElement(node);
         if (superClass) {
             var type = checker.getTypeAtLocation(superClass);
             if (type && type.symbol) {
                 var declaration = ts.getDeclarationOfKind(type.symbol, 238 /* ClassDeclaration */);
                 if (declaration) {
-                    superMethodNames = checkClassInstantiation(declaration);
+                    methodNames = checkClassInstantiation(declaration);
                 }
             }
         }
@@ -80482,7 +80482,7 @@ var ts;
             }
             if (member.kind === 154 /* MethodDeclaration */) { // called by super class.
                 var methodName = ts.unescapeLeadingUnderscores(ts.getTextOfPropertyName(member.name));
-                if (superMethodNames.indexOf(methodName) != -1) {
+                if (methodNames.indexOf(methodName) != -1) {
                     visitBlock(member.body);
                 }
             }
@@ -80495,7 +80495,6 @@ var ts;
                 visitBlock(constructor.body);
             }
         }
-        var methodNames = [];
         for (var i = index; i < calledMethods.length; i++) {
             var method = calledMethods[i];
             for (var _a = 0, members_9 = members; _a < members_9.length; _a++) {
diff --git a/lib/typingsInstaller.js b/lib/typingsInstaller.js
@@ -89,7 +89,7 @@ var ts;
     ts.versionMajorMinor = "3.1";
     /** The version of the TypeScript compiler release */
     ts.version = ts.versionMajorMinor + ".3";
-    ts.version_plus = "3.1.4";
+    ts.version_plus = "3.1.5";
 })(ts || (ts = {}));
 (function (ts) {
     /* @internal */
@@ -80472,14 +80472,14 @@ var ts;
         }
     }
     function checkClassInstantiation(node) {
-        var superMethodNames = [];
+        var methodNames = [];
         var superClass = ts.getClassExtendsHeritageElement(node);
         if (superClass) {
             var type = checker.getTypeAtLocation(superClass);
             if (type && type.symbol) {
                 var declaration = ts.getDeclarationOfKind(type.symbol, 238 /* ClassDeclaration */);
                 if (declaration) {
-                    superMethodNames = checkClassInstantiation(declaration);
+                    methodNames = checkClassInstantiation(declaration);
                 }
             }
         }
@@ -80495,7 +80495,7 @@ var ts;
             }
             if (member.kind === 154 /* MethodDeclaration */) { // called by super class.
                 var methodName = ts.unescapeLeadingUnderscores(ts.getTextOfPropertyName(member.name));
-                if (superMethodNames.indexOf(methodName) != -1) {
+                if (methodNames.indexOf(methodName) != -1) {
                     visitBlock(member.body);
                 }
             }
@@ -80508,7 +80508,6 @@ var ts;
                 visitBlock(constructor.body);
             }
         }
-        var methodNames = [];
         for (var i = index; i < calledMethods.length; i++) {
             var method = calledMethods[i];
             for (var _a = 0, members_9 = members; _a < members_9.length; _a++) {
diff --git a/package.json b/package.json
@@ -2,7 +2,7 @@
     "name": "typescript-plus",
     "author": "Dom Chen",
     "homepage": "http://www.idom.me/",
-    "version": "3.1.4",
+    "version": "3.1.5",
     "license": "Apache-2.0",
     "description": "An enhanced version of the original typescript compiler.",
     "keywords": [
diff --git a/src/compiler/core.ts b/src/compiler/core.ts
@@ -4,7 +4,7 @@ namespace ts {
     export const versionMajorMinor = "3.1";
     /** The version of the TypeScript compiler release */
     export const version = `${versionMajorMinor}.3`;
-    export const version_plus = "3.1.4";
+    export const version_plus = "3.1.5";
 }
 
 namespace ts {
diff --git a/src/compiler/sorting.ts b/src/compiler/sorting.ts
@@ -606,14 +606,14 @@ namespace ts {
     }
 
     function checkClassInstantiation(node: ClassDeclaration): string[] {
-        let superMethodNames: string[] = [];
+        let methodNames: string[] = [];
         let superClass = getClassExtendsHeritageElement(node);
         if (superClass) {
             let type = checker!.getTypeAtLocation(superClass);
             if (type && type.symbol) {
                 let declaration = <ClassDeclaration>ts.getDeclarationOfKind(type.symbol, SyntaxKind.ClassDeclaration);
                 if (declaration) {
-                    superMethodNames = checkClassInstantiation(declaration);
+                    methodNames = checkClassInstantiation(declaration);
                 }
             }
         }
@@ -629,7 +629,7 @@ namespace ts {
             }
             if (member.kind === SyntaxKind.MethodDeclaration) { // called by super class.
                 let methodName = ts.unescapeLeadingUnderscores(ts.getTextOfPropertyName(member.name!));
-                if (superMethodNames.indexOf(methodName) != -1) {
+                if (methodNames.indexOf(methodName) != -1) {
                     visitBlock((<MethodDeclaration>member).body);
                 }
             }
@@ -642,7 +642,7 @@ namespace ts {
                 visitBlock(constructor.body);
             }
         }
-        let methodNames: string[] = [];
+        
         for (let i = index; i < calledMethods.length; i++) {
             let method = calledMethods[i];
             for (let memeber of members) {

Original file line number	Diff line number	Diff line change
`@@ -61,7 +61,7 @@ var ts;`
`61`	`61`	`(function (ts) {`
`62`	`62`	`ts.versionMajorMinor = "3.1";`
`63`	`63`	`ts.version = ts.versionMajorMinor + ".3";`
`64`		`- ts.version_plus = "3.1.4";`
	`64`	`+ ts.version_plus = "3.1.5";`
`65`	`65`	`})(ts \|\| (ts = {}));`
`66`	`66`	`(function (ts) {`
`67`	`67`	`ts.emptyArray = [];`
`@@ -65190,14 +65190,14 @@ var ts;`
`65190`	`65190`	`}`
`65191`	`65191`	`}`
`65192`	`65192`	`function checkClassInstantiation(node) {`
`65193`		`- var superMethodNames = [];`
	`65193`	`+ var methodNames = [];`
`65194`	`65194`	`var superClass = ts.getClassExtendsHeritageElement(node);`
`65195`	`65195`	`if (superClass) {`
`65196`	`65196`	`var type = checker.getTypeAtLocation(superClass);`
`65197`	`65197`	`if (type && type.symbol) {`
`65198`	`65198`	`var declaration = ts.getDeclarationOfKind(type.symbol, 238);`
`65199`	`65199`	`if (declaration) {`
`65200`		`- superMethodNames = checkClassInstantiation(declaration);`
	`65200`	`+ methodNames = checkClassInstantiation(declaration);`
`65201`	`65201`	`}`
`65202`	`65202`	`}`
`65203`	`65203`	`}`
`@@ -65213,7 +65213,7 @@ var ts;`
`65213`	`65213`	`}`
`65214`	`65214`	`if (member.kind === 154) {`
`65215`	`65215`	`var methodName = ts.unescapeLeadingUnderscores(ts.getTextOfPropertyName(member.name));`
`65216`		`- if (superMethodNames.indexOf(methodName) != -1) {`
	`65216`	`+ if (methodNames.indexOf(methodName) != -1) {`
`65217`	`65217`	`visitBlock(member.body);`
`65218`	`65218`	`}`
`65219`	`65219`	`}`
`@@ -65226,7 +65226,6 @@ var ts;`
`65226`	`65226`	`visitBlock(constructor.body);`
`65227`	`65227`	`}`
`65228`	`65228`	`}`
`65229`		`- var methodNames = [];`
`65230`	`65229`	`for (var i = index; i < calledMethods.length; i++) {`
`65231`	`65230`	`var method = calledMethods[i];`
`65232`	`65231`	`for (var _a = 0, members_9 = members; _a < members_9.length; _a++) {`
Original file line number	Diff line number	Diff line change
`@@ -89,7 +89,7 @@ var ts;`
`89`	`89`	`ts.versionMajorMinor = "3.1";`
`90`	`90`	`/** The version of the TypeScript compiler release */`
`91`	`91`	`ts.version = ts.versionMajorMinor + ".3";`
`92`		`- ts.version_plus = "3.1.4";`
	`92`	`+ ts.version_plus = "3.1.5";`
`93`	`93`	`})(ts \|\| (ts = {}));`
`94`	`94`	`(function (ts) {`
`95`	`95`	`/* @internal */`
`@@ -80472,14 +80472,14 @@ var ts;`
`80472`	`80472`	`}`
`80473`	`80473`	`}`
`80474`	`80474`	`function checkClassInstantiation(node) {`
`80475`		`- var superMethodNames = [];`
	`80475`	`+ var methodNames = [];`
`80476`	`80476`	`var superClass = ts.getClassExtendsHeritageElement(node);`
`80477`	`80477`	`if (superClass) {`
`80478`	`80478`	`var type = checker.getTypeAtLocation(superClass);`
`80479`	`80479`	`if (type && type.symbol) {`
`80480`	`80480`	`var declaration = ts.getDeclarationOfKind(type.symbol, 238 /* ClassDeclaration */);`
`80481`	`80481`	`if (declaration) {`
`80482`		`- superMethodNames = checkClassInstantiation(declaration);`
	`80482`	`+ methodNames = checkClassInstantiation(declaration);`
`80483`	`80483`	`}`
`80484`	`80484`	`}`
`80485`	`80485`	`}`
`@@ -80495,7 +80495,7 @@ var ts;`
`80495`	`80495`	`}`
`80496`	`80496`	`if (member.kind === 154 /* MethodDeclaration */) { // called by super class.`
`80497`	`80497`	`var methodName = ts.unescapeLeadingUnderscores(ts.getTextOfPropertyName(member.name));`
`80498`		`- if (superMethodNames.indexOf(methodName) != -1) {`
	`80498`	`+ if (methodNames.indexOf(methodName) != -1) {`
`80499`	`80499`	`visitBlock(member.body);`
`80500`	`80500`	`}`
`80501`	`80501`	`}`
`@@ -80508,7 +80508,6 @@ var ts;`
`80508`	`80508`	`visitBlock(constructor.body);`
`80509`	`80509`	`}`
`80510`	`80510`	`}`
`80511`		`- var methodNames = [];`
`80512`	`80511`	`for (var i = index; i < calledMethods.length; i++) {`
`80513`	`80512`	`var method = calledMethods[i];`
`80514`	`80513`	`for (var _a = 0, members_9 = members; _a < members_9.length; _a++) {`
Original file line number	Diff line number	Diff line change
`@@ -17,7 +17,7 @@ declare namespace ts {`
`17`	`17`	`const versionMajorMinor = "3.1";`
`18`	`18`	`/** The version of the TypeScript compiler release */`
`19`	`19`	`const version: string;`
`20`		`- const version_plus = "3.1.4";`
	`20`	`+ const version_plus = "3.1.5";`
`21`	`21`	`}`
`22`	`22`	`declare namespace ts {`
`23`	`23`	`/**`
Original file line number	Diff line number	Diff line change
`@@ -85,7 +85,7 @@ var ts;`
`85`	`85`	`ts.versionMajorMinor = "3.1";`
`86`	`86`	`/** The version of the TypeScript compiler release */`
`87`	`87`	`ts.version = ts.versionMajorMinor + ".3";`
`88`		`- ts.version_plus = "3.1.4";`
	`88`	`+ ts.version_plus = "3.1.5";`
`89`	`89`	`})(ts \|\| (ts = {}));`
`90`	`90`	`(function (ts) {`
`91`	`91`	`/* @internal */`
`@@ -80468,14 +80468,14 @@ var ts;`
`80468`	`80468`	`}`
`80469`	`80469`	`}`
`80470`	`80470`	`function checkClassInstantiation(node) {`
`80471`		`- var superMethodNames = [];`
	`80471`	`+ var methodNames = [];`
`80472`	`80472`	`var superClass = ts.getClassExtendsHeritageElement(node);`
`80473`	`80473`	`if (superClass) {`
`80474`	`80474`	`var type = checker.getTypeAtLocation(superClass);`
`80475`	`80475`	`if (type && type.symbol) {`
`80476`	`80476`	`var declaration = ts.getDeclarationOfKind(type.symbol, 238 /* ClassDeclaration */);`
`80477`	`80477`	`if (declaration) {`
`80478`		`- superMethodNames = checkClassInstantiation(declaration);`
	`80478`	`+ methodNames = checkClassInstantiation(declaration);`
`80479`	`80479`	`}`
`80480`	`80480`	`}`
`80481`	`80481`	`}`
`@@ -80491,7 +80491,7 @@ var ts;`
`80491`	`80491`	`}`
`80492`	`80492`	`if (member.kind === 154 /* MethodDeclaration */) { // called by super class.`
`80493`	`80493`	`var methodName = ts.unescapeLeadingUnderscores(ts.getTextOfPropertyName(member.name));`
`80494`		`- if (superMethodNames.indexOf(methodName) != -1) {`
	`80494`	`+ if (methodNames.indexOf(methodName) != -1) {`
`80495`	`80495`	`visitBlock(member.body);`
`80496`	`80496`	`}`
`80497`	`80497`	`}`
`@@ -80504,7 +80504,6 @@ var ts;`
`80504`	`80504`	`visitBlock(constructor.body);`
`80505`	`80505`	`}`
`80506`	`80506`	`}`
`80507`		`- var methodNames = [];`
`80508`	`80507`	`for (var i = index; i < calledMethods.length; i++) {`
`80509`	`80508`	`var method = calledMethods[i];`
`80510`	`80509`	`for (var _a = 0, members_9 = members; _a < members_9.length; _a++) {`
Original file line number	Diff line number	Diff line change
`@@ -76,7 +76,7 @@ var ts;`
`76`	`76`	`ts.versionMajorMinor = "3.1";`
`77`	`77`	`/** The version of the TypeScript compiler release */`
`78`	`78`	`ts.version = ts.versionMajorMinor + ".3";`
`79`		`- ts.version_plus = "3.1.4";`
	`79`	`+ ts.version_plus = "3.1.5";`
`80`	`80`	`})(ts \|\| (ts = {}));`
`81`	`81`	`(function (ts) {`
`82`	`82`	`/* @internal */`
`@@ -80459,14 +80459,14 @@ var ts;`
`80459`	`80459`	`}`
`80460`	`80460`	`}`
`80461`	`80461`	`function checkClassInstantiation(node) {`
`80462`		`- var superMethodNames = [];`
	`80462`	`+ var methodNames = [];`
`80463`	`80463`	`var superClass = ts.getClassExtendsHeritageElement(node);`
`80464`	`80464`	`if (superClass) {`
`80465`	`80465`	`var type = checker.getTypeAtLocation(superClass);`
`80466`	`80466`	`if (type && type.symbol) {`
`80467`	`80467`	`var declaration = ts.getDeclarationOfKind(type.symbol, 238 /* ClassDeclaration */);`
`80468`	`80468`	`if (declaration) {`
`80469`		`- superMethodNames = checkClassInstantiation(declaration);`
	`80469`	`+ methodNames = checkClassInstantiation(declaration);`
`80470`	`80470`	`}`
`80471`	`80471`	`}`
`80472`	`80472`	`}`
`@@ -80482,7 +80482,7 @@ var ts;`
`80482`	`80482`	`}`
`80483`	`80483`	`if (member.kind === 154 /* MethodDeclaration */) { // called by super class.`
`80484`	`80484`	`var methodName = ts.unescapeLeadingUnderscores(ts.getTextOfPropertyName(member.name));`
`80485`		`- if (superMethodNames.indexOf(methodName) != -1) {`
	`80485`	`+ if (methodNames.indexOf(methodName) != -1) {`
`80486`	`80486`	`visitBlock(member.body);`
`80487`	`80487`	`}`
`80488`	`80488`	`}`
`@@ -80495,7 +80495,6 @@ var ts;`
`80495`	`80495`	`visitBlock(constructor.body);`
`80496`	`80496`	`}`
`80497`	`80497`	`}`
`80498`		`- var methodNames = [];`
`80499`	`80498`	`for (var i = index; i < calledMethods.length; i++) {`
`80500`	`80499`	`var method = calledMethods[i];`
`80501`	`80500`	`for (var _a = 0, members_9 = members; _a < members_9.length; _a++) {`