Skip to content

SONARJAVA-7255 Convert the PSI syntax tree to the Sonar AST #6424

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
aurelien-coet-sonarsource wants to merge 1 commit into from
Closed

SONARJAVA-7255 Convert the PSI syntax tree to the Sonar AST #6424

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
294 changes: 294 additions & 0 deletions java-frontend/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,10 +14,293 @@
<description>Code Analyzer for Java :: Front-end (Java Parser)</description>

<properties>
<intellij.version>262.10968.63</intellij.version>
<intellij.kotlin.version>2.4.0</intellij.kotlin.version>
<intellij.coroutines.version>1.10.2-intellij-2</intellij.coroutines.version>
<intellij.collections-immutable.version>0.5.0</intellij.collections-immutable.version>
<intellij.fastutil.version>8.5.18-jb1</intellij.fastutil.version>
<intellij.opentelemetry.version>1.48.0</intellij.opentelemetry.version>
<commons-collections.version>3.2.1</commons-collections.version>
</properties>

<dependencies>
<!-- IntelliJ PSI: explicit allowlist of the artifacts loaded by the PSI syntax adapter; transitive dependencies are excluded -->
<dependency>
<groupId>com.jetbrains.intellij.java</groupId>
<artifactId>java-psi</artifactId>
<version>${intellij.version}</version>
<exclusions>
<exclusion>
<groupId>*</groupId>
<artifactId>*</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>com.jetbrains.intellij.java</groupId>
<artifactId>java-psi-impl</artifactId>
<version>${intellij.version}</version>
<exclusions>
<exclusion>
<groupId>*</groupId>
<artifactId>*</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>com.jetbrains.intellij.java</groupId>
<artifactId>java-syntax</artifactId>
<version>${intellij.version}</version>
<exclusions>
<exclusion>
<groupId>*</groupId>
<artifactId>*</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>com.jetbrains.intellij.java</groupId>
<artifactId>java-frontback-psi</artifactId>
<version>${intellij.version}</version>
<exclusions>
<exclusion>
<groupId>*</groupId>
<artifactId>*</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>com.jetbrains.intellij.java</groupId>
<artifactId>java-frontback-psi-impl</artifactId>
<version>${intellij.version}</version>
<exclusions>
<exclusion>
<groupId>*</groupId>
<artifactId>*</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>com.jetbrains.intellij.platform</groupId>
<artifactId>core</artifactId>
<version>${intellij.version}</version>
<exclusions>
<exclusion>
<groupId>*</groupId>
<artifactId>*</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>com.jetbrains.intellij.platform</groupId>
<artifactId>core-impl</artifactId>
<version>${intellij.version}</version>
<exclusions>
<exclusion>
<groupId>*</groupId>
<artifactId>*</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>com.jetbrains.intellij.platform</groupId>
<artifactId>diagnostic</artifactId>
<version>${intellij.version}</version>
<exclusions>
<exclusion>
<groupId>*</groupId>
<artifactId>*</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>com.jetbrains.intellij.platform</groupId>
<artifactId>diagnostic-telemetry</artifactId>
<version>${intellij.version}</version>
<exclusions>
<exclusion>
<groupId>*</groupId>
<artifactId>*</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>com.jetbrains.intellij.platform</groupId>
<artifactId>extensions</artifactId>
<version>${intellij.version}</version>
<exclusions>
<exclusion>
<groupId>*</groupId>
<artifactId>*</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>com.jetbrains.intellij.platform</groupId>
<artifactId>syntax</artifactId>
<version>${intellij.version}</version>
<exclusions>
<exclusion>
<groupId>*</groupId>
<artifactId>*</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>com.jetbrains.intellij.platform</groupId>
<artifactId>syntax-i18-n</artifactId>
<version>${intellij.version}</version>
<exclusions>
<exclusion>
<groupId>*</groupId>
<artifactId>*</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>com.jetbrains.intellij.platform</groupId>
<artifactId>syntax-psi</artifactId>
<version>${intellij.version}</version>
<exclusions>
<exclusion>
<groupId>*</groupId>
<artifactId>*</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>com.jetbrains.intellij.platform</groupId>
<artifactId>syntax-util</artifactId>
<version>${intellij.version}</version>
<exclusions>
<exclusion>
<groupId>*</groupId>
<artifactId>*</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>com.jetbrains.intellij.platform</groupId>
<artifactId>util</artifactId>
<version>${intellij.version}</version>
<exclusions>
<exclusion>
<groupId>*</groupId>
<artifactId>*</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>com.jetbrains.intellij.platform</groupId>
<artifactId>util-base</artifactId>
<version>${intellij.version}</version>
<exclusions>
<exclusion>
<groupId>*</groupId>
<artifactId>*</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>com.jetbrains.intellij.platform</groupId>
<artifactId>util-base-multiplatform</artifactId>
<version>${intellij.version}</version>
<exclusions>
<exclusion>
<groupId>*</groupId>
<artifactId>*</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>com.jetbrains.intellij.platform</groupId>
<artifactId>util-coroutines</artifactId>
<version>${intellij.version}</version>
<exclusions>
<exclusion>
<groupId>*</groupId>
<artifactId>*</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>com.jetbrains.intellij.platform</groupId>
<artifactId>util-multiplatform</artifactId>
<version>${intellij.version}</version>
<exclusions>
<exclusion>
<groupId>*</groupId>
<artifactId>*</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>com.jetbrains.intellij.platform</groupId>
<artifactId>util-rt</artifactId>
<version>${intellij.version}</version>
<exclusions>
<exclusion>
<groupId>*</groupId>
<artifactId>*</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.jetbrains.kotlin</groupId>
<artifactId>kotlin-stdlib</artifactId>
<version>${intellij.kotlin.version}</version>
<exclusions>
<exclusion>
<groupId>*</groupId>
<artifactId>*</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.jetbrains.intellij.deps.kotlinx</groupId>
<artifactId>kotlinx-coroutines-core-jvm</artifactId>
<version>${intellij.coroutines.version}</version>
<exclusions>
<exclusion>
<groupId>*</groupId>
<artifactId>*</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.jetbrains.kotlinx</groupId>
<artifactId>kotlinx-collections-immutable-jvm</artifactId>
<version>${intellij.collections-immutable.version}</version>
<exclusions>
<exclusion>
<groupId>*</groupId>
<artifactId>*</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.jetbrains.intellij.deps.fastutil</groupId>
<artifactId>intellij-deps-fastutil</artifactId>
<version>${intellij.fastutil.version}</version>
<exclusions>
<exclusion>
<groupId>*</groupId>
<artifactId>*</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>io.opentelemetry</groupId>
<artifactId>opentelemetry-api</artifactId>
<version>${intellij.opentelemetry.version}</version>
<exclusions>
<exclusion>
<groupId>*</groupId>
<artifactId>*</artifactId>
</exclusion>
</exclusions>
</dependency>

<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>jdt-package</artifactId>
Expand Down Expand Up @@ -145,6 +428,17 @@

<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
<argLine combine.self="override">-Dnet.bytebuddy.experimental=true -javaagent:"${test-java-agent-directory}/${jacoco-agent-jar}=destfile=${project.build.directory}/jacoco.exec" -javaagent:"${test-java-agent-directory}/${mockito-agent-jar}" --add-opens=java.base/java.lang=ALL-UNNAMED</argLine>
<systemPropertyVariables>
<java.awt.headless>true</java.awt.headless>
<idea.config.path>${project.build.directory}/idea-config</idea.config.path>
</systemPropertyVariables>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-dependency-plugin</artifactId>
Expand Down
20 changes: 1 addition & 19 deletions java-frontend/src/main/java/org/sonar/java/model/JParser.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,6 @@
import java.util.Collections;
import java.util.Deque;
import java.util.HashMap;
import java.util.Iterator;
import java.util.LinkedList;
import java.util.List;
import java.util.Map;
Expand Down Expand Up @@ -348,7 +347,7 @@ static JavaTree.CompilationUnitTreeImpl convert(String version, String unitName,

ASTUtils.mayTolerateMissingType(astNode.getAST());

setParents(tree);
JavaTreeFinalizer.setParents(tree);
return tree;
}

Expand All @@ -357,23 +356,6 @@ static TokenManager createTokenManager(String version, String unitName, String s
return new TokenManager(lex(version, unitName, source.toCharArray()), source, new DefaultCodeFormatterOptions(new HashMap<>()));
}

private static void setParents(Tree node) {
Iterator<Tree> childrenIterator = iteratorFor(node);
while (childrenIterator.hasNext()) {
Tree child = childrenIterator.next();
((JavaTree) child).setParent(node);
setParents(child);
}
}

private static Iterator<Tree> iteratorFor(Tree node) {
if (node.kind() == Tree.Kind.INFERED_TYPE || node.kind() == Tree.Kind.TOKEN) {
// getChildren throws exception in this case
return Collections.emptyIterator();
}
return ((JavaTree) node).getChildren().iterator();
}

@VisibleForTesting
static List<Token> lex(String version, String unitName, char[] sourceChars) {
List<Token> tokens = new ArrayList<>();
Expand Down
44 changes: 44 additions & 0 deletions java-frontend/src/main/java/org/sonar/java/model/JavaTreeFinalizer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,44 @@
/*
* SonarQube Java
* Copyright (C) SonarSource Sàrl
* mailto:info AT sonarsource DOT com
*
* You can redistribute and/or modify this program under the terms of
* the Sonar Source-Available License Version 1, as published by SonarSource Sàrl.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
* See the Sonar Source-Available License for more details.
*
* You should have received a copy of the Sonar Source-Available License
* along with this program; if not, see https://sonarsource.com/license/ssal/
*/
package org.sonar.java.model;

import java.util.Collections;
import java.util.Iterator;
import org.sonar.plugins.java.api.tree.Tree;

public final class JavaTreeFinalizer {

private JavaTreeFinalizer() {
}

public static void setParents(Tree node) {
Iterator<Tree> childrenIterator = iteratorFor(node);
while (childrenIterator.hasNext()) {
Tree child = childrenIterator.next();
((JavaTree) child).setParent(node);
setParents(child);
}
}

private static Iterator<Tree> iteratorFor(Tree node) {
if (node.kind() == Tree.Kind.INFERED_TYPE || node.kind() == Tree.Kind.TOKEN) {
return Collections.emptyIterator();
}
return ((JavaTree) node).getChildren().iterator();
}

}
Loading
Loading