Merge pull request microsoft#12415 from Microsoft/fix_lint

Andy · web-flow · commit baa228bbe887 · 2016-11-21T10:53:16.000-08:00
Fix lint errors
diff --git a/src/services/codefixes/importFixes.ts b/src/services/codefixes/importFixes.ts
@@ -52,7 +52,7 @@ namespace ts.codefix {
                         // than another existing one. For example, you may have new imports from "./foo/bar"
                         // and "bar", when the new one is "bar/bar2" and the current one is "./foo/bar". The new
                         // one and the current one are not comparable (one relative path and one absolute path),
-                        // but the new one is worse than the other one, so should not add to the list.  
+                        // but the new one is worse than the other one, so should not add to the list.
                         updatedNewImports.push(existingAction);
                         break;
                     case ModuleSpecifierComparison.Worse:
@@ -145,7 +145,7 @@ namespace ts.codefix {
                     if (localSymbol && localSymbol.name === name && checkSymbolHasMeaning(localSymbol, currentTokenMeaning)) {
                         // check if this symbol is already used
                         const symbolId = getUniqueSymbolId(localSymbol);
-                        symbolIdActionMap.addActions(symbolId, getCodeActionForImport(moduleSymbol, /*isDefaultExport*/ true));
+                        symbolIdActionMap.addActions(symbolId, getCodeActionForImport(moduleSymbol, /*isDefault*/ true));
                     }
                 }
 
@@ -483,7 +483,7 @@ namespace ts.codefix {
                                 const normalizedTypeRoots = map(typeRoots, typeRoot => toPath(typeRoot, /*basePath*/ undefined, getCanonicalFileName));
                                 for (const typeRoot of normalizedTypeRoots) {
                                     if (startsWith(moduleFileName, typeRoot)) {
-                                        let relativeFileName = moduleFileName.substring(typeRoot.length + 1);
+                                        const relativeFileName = moduleFileName.substring(typeRoot.length + 1);
                                         return removeExtensionAndIndexPostFix(relativeFileName);
                                     }
                                 }

Original file line number	Diff line number	Diff line change
`@@ -52,7 +52,7 @@ namespace ts.codefix {`
`52`	`52`	`// than another existing one. For example, you may have new imports from "./foo/bar"`
`53`	`53`	`// and "bar", when the new one is "bar/bar2" and the current one is "./foo/bar". The new`
`54`	`54`	`// one and the current one are not comparable (one relative path and one absolute path),`
`55`		`- // but the new one is worse than the other one, so should not add to the list.`
	`55`	`+ // but the new one is worse than the other one, so should not add to the list.`
`56`	`56`	`updatedNewImports.push(existingAction);`
`57`	`57`	`break;`
`58`	`58`	`case ModuleSpecifierComparison.Worse:`
`@@ -145,7 +145,7 @@ namespace ts.codefix {`
`145`	`145`	`if (localSymbol && localSymbol.name === name && checkSymbolHasMeaning(localSymbol, currentTokenMeaning)) {`
`146`	`146`	`// check if this symbol is already used`
`147`	`147`	`const symbolId = getUniqueSymbolId(localSymbol);`
`148`		`- symbolIdActionMap.addActions(symbolId, getCodeActionForImport(moduleSymbol, /isDefaultExport/ true));`
	`148`	`+ symbolIdActionMap.addActions(symbolId, getCodeActionForImport(moduleSymbol, /isDefault/ true));`
`149`	`149`	`}`
`150`	`150`	`}`
`151`	`151`
`@@ -483,7 +483,7 @@ namespace ts.codefix {`
`483`	`483`	`const normalizedTypeRoots = map(typeRoots, typeRoot => toPath(typeRoot, /basePath/ undefined, getCanonicalFileName));`
`484`	`484`	`for (const typeRoot of normalizedTypeRoots) {`
`485`	`485`	`if (startsWith(moduleFileName, typeRoot)) {`
`486`		`- let relativeFileName = moduleFileName.substring(typeRoot.length + 1);`
	`486`	`+ const relativeFileName = moduleFileName.substring(typeRoot.length + 1);`
`487`	`487`	`return removeExtensionAndIndexPostFix(relativeFileName);`
`488`	`488`	`}`
`489`	`489`	`}`