Skip to content

Commit 6b182c5

Browse files
authored
Merge pull request #18396 from igfoo/igfoo/path_transformer
Kotlin: Add CODEQL_PATH_TRANSFORMER support
2 parents c68b55b + 78b277b commit 6b182c5

File tree

3 files changed

+10
-1
lines changed

3 files changed

+10
-1
lines changed

java/kotlin-extractor/src/main/java/com/semmle/util/process/Env.java

+1
Original file line numberDiff line numberDiff line change
@@ -115,6 +115,7 @@ public enum Var {
115115
*/
116116
SEMMLE_TRAP_IMPORTER,
117117
SEMMLE_PRESERVE_SYMLINKS,
118+
CODEQL_PATH_TRANSFORMER,
118119
SEMMLE_PATH_TRANSFORMER,
119120

120121
/*

java/kotlin-extractor/src/main/java/com/semmle/util/trap/pathtransformers/PathTransformer.java

+4-1
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,10 @@ public File canonicalFile(String path) {
4141

4242
private static final PathTransformer DEFAULT_TRANSFORMER;
4343
static {
44-
String layout = Env.systemEnv().get(Var.SEMMLE_PATH_TRANSFORMER);
44+
String layout = Env.systemEnv().get(Var.CODEQL_PATH_TRANSFORMER);
45+
if (layout == null) {
46+
layout = Env.systemEnv().get(Var.SEMMLE_PATH_TRANSFORMER);
47+
}
4548
if (layout == null)
4649
DEFAULT_TRANSFORMER = new NoopTransformer();
4750
else
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
---
2+
category: feature
3+
---
4+
* The Java and Kotlin extractors now support `CODEQL_PATH_TRANSFORMER`. `SEMMLE_PATH_TRANSFORMER` is still supported, but deprecated.
5+

0 commit comments

Comments
 (0)