maxmustermann/TypeScript
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Lint

Browse source
This commit is contained in:
Ryan Cavanaugh 2016-05-18 11:12:02 -07:00
parent 917ab0aa0a
commit f0e3ebe37d
2 changed files with 4 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/compiler/program.ts
View file

@ -18,8 +18,6 @@ namespace ts {
"node_modules/@types/",
];
const autoImportedTypePaths = ["types", "node_modules/@types"];
export const version = "1.9.0";
export function findConfigFile(searchPath: string, fileExists: (fileName: string) => boolean): string {
@ -878,8 +876,8 @@ namespace ts {
}
function getDefaultTypeDirectiveNames(rootPath: string): string[] {
const localTypes = combinePaths(rootPath, 'types');
const npmTypes = combinePaths(rootPath, 'node_modules/@types');
const localTypes = combinePaths(rootPath, "types");
const npmTypes = combinePaths(rootPath, "node_modules/@types");
let result: string[] = [];
if (sys.directoryExists(localTypes)) {
result = result.concat(sys.getDirectories(localTypes));
@ -1029,7 +1027,7 @@ namespace ts {
else {
// or load all types from the automatic type import fields
if (host.getDefaultTypeDirectiveNames) {
typeReferences = host.getDefaultTypeDirectiveNames(getCommonSourceDirectory());;
typeReferences = host.getDefaultTypeDirectiveNames(getCommonSourceDirectory());
}
}

2
src/harness/harness.ts
View file

@ -905,7 +905,7 @@ namespace Harness {
fileMap.forEachValue((key, value) => {
const rx = /node_modules\/@types\/(\w+)/;
const typeNameResult = rx.exec(key);
if(typeNameResult) {
if (typeNameResult) {
const typeName = typeNameResult[1];
if (results.indexOf(typeName) < 0) {
results.push(typeName);