TS: fix the fix

asger-semmle · asger-semmle · commit 84c1ba0b31ab · 2018-11-16T14:39:43.000Z
diff --git a/javascript/extractor/src/com/semmle/js/extractor/AutoBuild.java b/javascript/extractor/src/com/semmle/js/extractor/AutoBuild.java
@@ -499,7 +499,7 @@ public FileVisitResult preVisitDirectory(Path dir, BasicFileAttributes attrs) th
 				Path sourcePath = sourceFile.toPath();
 				if (!filesToExtract.contains(normalizePath(sourcePath)))
 					continue;
-				if (extractedFiles.add(sourcePath)) {
+				if (!extractedFiles.contains(sourcePath)) {
 					typeScriptFiles.add(sourcePath.toFile());
 				}
 			}
@@ -547,9 +547,8 @@ public void extractTypeScriptFiles(List<File> files, Set<Path> extractedFiles, F
 		extractorState.getTypeScriptParser().prepareFiles(files);
 		for (File f : files) {
 			Path path = f.toPath();
-			if (extractedFiles.add(path)) {
-				extract(extractor, f.toPath());
-			}
+			extractedFiles.add(path);
+			extract(extractor, f.toPath());
 		}
 	}
 

Original file line number	Diff line number	Diff line change
`@@ -499,7 +499,7 @@ public FileVisitResult preVisitDirectory(Path dir, BasicFileAttributes attrs) th`
`499`	`499`	`Path sourcePath = sourceFile.toPath();`
`500`	`500`	`if (!filesToExtract.contains(normalizePath(sourcePath)))`
`501`	`501`	`continue;`
`502`		`- if (extractedFiles.add(sourcePath)) {`
	`502`	`+ if (!extractedFiles.contains(sourcePath)) {`
`503`	`503`	`typeScriptFiles.add(sourcePath.toFile());`
`504`	`504`	`}`
`505`	`505`	`}`
`@@ -547,9 +547,8 @@ public void extractTypeScriptFiles(List<File> files, Set<Path> extractedFiles, F`
`547`	`547`	`extractorState.getTypeScriptParser().prepareFiles(files);`
`548`	`548`	`for (File f : files) {`
`549`	`549`	`Path path = f.toPath();`
`550`		`- if (extractedFiles.add(path)) {`
`551`		`- extract(extractor, f.toPath());`
`552`		`- }`
	`550`	`+ extractedFiles.add(path);`
	`551`	`+ extract(extractor, f.toPath());`
`553`	`552`	`}`
`554`	`553`	`}`
`555`	`554`