Skip to content

Highlight 'module' in 'import module' as keyword. #8975

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

Merged
lahodaj merged 1 commit into from
Nov 4, 2025
Merged

Highlight 'module' in 'import module' as keyword. #8975

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
16 changes: 16 additions & 0 deletions ...itor.base/src/org/netbeans/modules/java/editor/base/semantic/SemanticHighlighterBase.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@
import com.sun.source.tree.ExportsTree;
import com.sun.source.tree.ExpressionStatementTree;
import com.sun.source.tree.IdentifierTree;
import com.sun.source.tree.ImportTree;
import com.sun.source.tree.LiteralTree;
import com.sun.source.tree.MemberReferenceTree;
import com.sun.source.tree.MemberSelectTree;
Expand Down Expand Up @@ -1052,6 +1053,21 @@ public Void visitLiteral(LiteralTree node, Void p) {
return super.visitLiteral(node, p);
}

@Override
public Void visitImport(ImportTree node, Void p) {
if (node.isModule()) {
int startPos =
(int) info.getTrees().getSourcePositions().getStartPosition(info.getCompilationUnit(), node);

tl.moveToOffset(startPos);
Token t = firstIdentifierToken("module");// NOI18N
if (tl != null) {
contextKeywords.add(t);
}
}
return super.visitImport(node, p);
}

@Override
public Void scan(Tree tree, Void p) {
if (tree != null && tree.getKind() == Kind.YIELD) {
Expand Down
11 changes: 11 additions & 0 deletions ...ditor.base/test/unit/src/org/netbeans/modules/java/editor/base/semantic/DetectorTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1090,6 +1090,17 @@ private void t(Object o) {
"[PARAMETER], 4:16-4:17");
}

public void testImportModule() throws Exception {
performTest("ImportModuleTest",
"""
import module java.base
public class ImportModuleTest {
}
""",
"[KEYWORD], 0:7-0:13",
"[PUBLIC, CLASS, DECLARATION], 1:13-1:29");
}

private void performTest(String fileName) throws Exception {
performTest(fileName, new Performer() {
public void compute(CompilationController parameter, Document doc, final ErrorDescriptionSetter setter) {
Expand Down
Loading