Merge pull request #18396 from igfoo/igfoo/path_transformer

Kotlin: Add CODEQL_PATH_TRANSFORMER support
github · Jan 13, 2025 · 6b182c5 · 6b182c5
2 parents c68b55b + 78b277b
commit 6b182c5
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 1 deletion.
diff --git a/java/kotlin-extractor/src/main/java/com/semmle/util/process/Env.java b/java/kotlin-extractor/src/main/java/com/semmle/util/process/Env.java
@@ -115,6 +115,7 @@ public enum Var {
 		 */
 		SEMMLE_TRAP_IMPORTER,
 		SEMMLE_PRESERVE_SYMLINKS,
+		CODEQL_PATH_TRANSFORMER,
 		SEMMLE_PATH_TRANSFORMER,
 
 		/*

diff --git a/...kotlin-extractor/src/main/java/com/semmle/util/trap/pathtransformers/PathTransformer.java b/...kotlin-extractor/src/main/java/com/semmle/util/trap/pathtransformers/PathTransformer.java
@@ -41,7 +41,10 @@ public File canonicalFile(String path) {
 
 	private static final PathTransformer DEFAULT_TRANSFORMER;
 	static {
-		String layout = Env.systemEnv().get(Var.SEMMLE_PATH_TRANSFORMER);
+		String layout = Env.systemEnv().get(Var.CODEQL_PATH_TRANSFORMER);
+		if (layout == null) {
+			layout = Env.systemEnv().get(Var.SEMMLE_PATH_TRANSFORMER);
+		}
 		if (layout == null)
 			DEFAULT_TRANSFORMER = new NoopTransformer();
 		else

diff --git a/java/ql/lib/change-notes/2025-01-03-path-transformer.md b/java/ql/lib/change-notes/2025-01-03-path-transformer.md
@@ -0,0 +1,5 @@
+---
+category: feature
+---
+* The Java and Kotlin extractors now support `CODEQL_PATH_TRANSFORMER`. `SEMMLE_PATH_TRANSFORMER` is still supported, but deprecated.
+