From 805deb13c01b59ea93aa0ac24a5b10189e2d90ce Mon Sep 17 00:00:00 2001 From: Asger Feldthaus Date: Fri, 26 Jun 2020 21:18:01 +0100 Subject: [PATCH] JS: Fix whitespace --- .../extractor/src/com/semmle/js/extractor/AutoBuild.java | 8 ++++---- .../src/com/semmle/js/extractor/ExtractorConfig.java | 4 ++-- .../src/com/semmle/js/extractor/VirtualSourceRoot.java | 4 ++-- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/javascript/extractor/src/com/semmle/js/extractor/AutoBuild.java b/javascript/extractor/src/com/semmle/js/extractor/AutoBuild.java index 671d8b9bfff..ea20b45367f 100644 --- a/javascript/extractor/src/com/semmle/js/extractor/AutoBuild.java +++ b/javascript/extractor/src/com/semmle/js/extractor/AutoBuild.java @@ -574,15 +574,15 @@ public class AutoBuild { public class FileExtractors { FileExtractor defaultExtractor; Map customExtractors = new LinkedHashMap<>(); - + FileExtractors(FileExtractor defaultExtractor) { this.defaultExtractor = defaultExtractor; } - + public FileExtractor forFile(Path f) { return customExtractors.getOrDefault(FileUtil.extension(f), defaultExtractor); } - + public FileType fileType(Path f) { return forFile(f).getFileType(f.toFile()); } @@ -630,7 +630,7 @@ public class AutoBuild { // extract remaining files extractFiles( - filesToExtract, extractedFiles, extractors, + filesToExtract, extractedFiles, extractors, f -> !(hasTypeScriptFiles && isFileDerivedFromTypeScriptFile(f, extractedFiles))); } diff --git a/javascript/extractor/src/com/semmle/js/extractor/ExtractorConfig.java b/javascript/extractor/src/com/semmle/js/extractor/ExtractorConfig.java index 441d51bfb62..5cd5d5ec4b1 100644 --- a/javascript/extractor/src/com/semmle/js/extractor/ExtractorConfig.java +++ b/javascript/extractor/src/com/semmle/js/extractor/ExtractorConfig.java @@ -236,7 +236,7 @@ public class ExtractorConfig { /** The default character encoding to use for parsing source files. */ private String defaultEncoding; - + private VirtualSourceRoot virtualSourceRoot; public ExtractorConfig(boolean experimental) { @@ -460,7 +460,7 @@ public class ExtractorConfig { public VirtualSourceRoot getVirtualSourceRoot() { return virtualSourceRoot; } - + public ExtractorConfig withVirtualSourceRoot(VirtualSourceRoot virtualSourceRoot) { ExtractorConfig res = new ExtractorConfig(this); res.virtualSourceRoot = virtualSourceRoot; diff --git a/javascript/extractor/src/com/semmle/js/extractor/VirtualSourceRoot.java b/javascript/extractor/src/com/semmle/js/extractor/VirtualSourceRoot.java index c5fb4a3061a..5c7a96e637f 100644 --- a/javascript/extractor/src/com/semmle/js/extractor/VirtualSourceRoot.java +++ b/javascript/extractor/src/com/semmle/js/extractor/VirtualSourceRoot.java @@ -5,7 +5,7 @@ import java.nio.file.Path; public class VirtualSourceRoot { private Path sourceRoot; private Path virtualSourceRoot; - + public static final VirtualSourceRoot none = new VirtualSourceRoot(null, null); public VirtualSourceRoot(Path sourceRoot, Path virtualSourceRoot) { @@ -33,7 +33,7 @@ public class VirtualSourceRoot { public Path getVirtualSourceRoot() { return virtualSourceRoot; } - + private static Path translate(Path oldRoot, Path newRoot, Path file) { if (oldRoot == null || newRoot == null) return null; Path relative = oldRoot.relativize(file);