infernap12/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2026-01-28 03:58:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

8374293: Jshell throws an error and crashes when using keyword Public

Browse Source 
Reviewed-by: jlahoda
This commit is contained in:
Lei Zhu 2026-01-24 14:19:40 +00:00 committed by Chen Liang
parent a3b1aa9f7d
commit a40dbce495
2 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/jdk.jshell/share/classes/jdk/jshell/SourceCodeAnalysisImpl.java
View File

@ -1,5 +1,5 @@
/* /*
* Copyright (c) 2014, 2025, Oracle and/or its affiliates. All rights reserved. * Copyright (c) 2014, 2026, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
* *
* This code is free software; you can redistribute it and/or modify it * This code is free software; you can redistribute it and/or modify it
@ -43,7 +43,6 @@ import com.sun.source.tree.NewClassTree;
import com.sun.source.tree.Scope; import com.sun.source.tree.Scope;
import com.sun.source.tree.Tree; import com.sun.source.tree.Tree;
import com.sun.source.tree.Tree.Kind; import com.sun.source.tree.Tree.Kind;
import static com.sun.source.tree.Tree.Kind.METHOD;
import com.sun.source.tree.TypeParameterTree; import com.sun.source.tree.TypeParameterTree;
import com.sun.source.tree.VariableTree; import com.sun.source.tree.VariableTree;
import com.sun.source.tree.YieldTree; import com.sun.source.tree.YieldTree;
@ -81,6 +80,7 @@ import java.util.Iterator;
import java.util.List; import java.util.List;
import java.util.Objects; import java.util.Objects;
import java.util.function.Predicate; import java.util.function.Predicate;
import java.util.TreeSet;
import javax.lang.model.element.Element; import javax.lang.model.element.Element;
import javax.lang.model.element.ElementKind; import javax.lang.model.element.ElementKind;
@ -114,7 +114,6 @@ import java.util.Map;
import java.util.NoSuchElementException; import java.util.NoSuchElementException;
import java.util.Optional; import java.util.Optional;
import java.util.Set; import java.util.Set;
import java.util.concurrent.Callable;
import java.util.concurrent.ExecutorService; import java.util.concurrent.ExecutorService;
import java.util.concurrent.Executors; import java.util.concurrent.Executors;
import java.util.function.BiConsumer; import java.util.function.BiConsumer;
@ -149,14 +148,10 @@ import javax.tools.JavaFileManager.Location;
import javax.tools.StandardLocation; import javax.tools.StandardLocation;
import jdk.jshell.ExpressionToTypeInfo.ExpressionInfo; import jdk.jshell.ExpressionToTypeInfo.ExpressionInfo;
import static jdk.jshell.Util.REPL_DOESNOTMATTER_CLASS_NAME;
import static jdk.jshell.SourceCodeAnalysis.Completeness.DEFINITELY_INCOMPLETE; import static jdk.jshell.SourceCodeAnalysis.Completeness.DEFINITELY_INCOMPLETE;
import static jdk.jshell.TreeDissector.printType; import static jdk.jshell.TreeDissector.printType;
import static java.util.stream.Collectors.joining; import static java.util.stream.Collectors.joining;
import static javax.lang.model.element.ElementKind.CONSTRUCTOR;
import static javax.lang.model.element.ElementKind.MODULE;
import static javax.lang.model.element.ElementKind.PACKAGE;
import javax.lang.model.type.IntersectionType; import javax.lang.model.type.IntersectionType;
import javax.lang.model.util.Elements; import javax.lang.model.util.Elements;
@ -815,7 +810,7 @@ class SourceCodeAnalysisImpl extends SourceCodeAnalysis {
}; };
String wrappedCode = codeWrap.wrapped(); String wrappedCode = codeWrap.wrapped();
return this.proc.taskFactory.analyze(codeWrap, task -> { return this.proc.taskFactory.analyze(codeWrap, task -> {
List<Highlight> result = new ArrayList<>(); TreeSet<Highlight> result = new TreeSet<>(Comparator.comparing(Highlight::start).thenComparing(Highlight::end));
CompilationUnitTree cut = task.cuTrees().iterator().next(); CompilationUnitTree cut = task.cuTrees().iterator().next();
Trees trees = task.trees(); Trees trees = task.trees();
SourcePositions sp = trees.getSourcePositions(); SourcePositions sp = trees.getSourcePositions();
@ -1050,8 +1045,7 @@ class SourceCodeAnalysisImpl extends SourceCodeAnalysis {
} }
}.scan(cut, null); }.scan(cut, null);
result.removeIf(h -> h.start() == h.end()); result.removeIf(h -> h.start() == h.end());
Collections.sort(result, (h1, h2) -> h1.start() - h2.start()); return new ArrayList<>(result);
return result;
}); });
} }

12
test/langtools/jdk/jshell/SnippetHighlightTest.java
View File

@ -1,5 +1,5 @@
/* /*
* Copyright (c) 2022, 2025, Oracle and/or its affiliates. All rights reserved. * Copyright (c) 2022, 2026, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
* *
* This code is free software; you can redistribute it and/or modify it * This code is free software; you can redistribute it and/or modify it
@ -23,7 +23,7 @@
/* /*
* @test * @test
* @bug 8274148 8301580 8359497 * @bug 8274148 8301580 8359497 8374293
* @summary Check snippet highlighting * @summary Check snippet highlighting
* @library /tools/lib * @library /tools/lib
* @modules jdk.compiler/com.sun.tools.javac.api * @modules jdk.compiler/com.sun.tools.javac.api
@ -122,6 +122,13 @@ public class SnippetHighlightTest extends KullaTesting {
"""); """);
} }
@Test // 8374293: The returned Highlights should not overlap
public void testHighlightsOverlap() {
assertHighlights("public void E test()", "Highlight[start=0, end=6, attributes=[KEYWORD]]",
"Highlight[start=7, end=11, attributes=[KEYWORD]]",
"Highlight[start=14, end=18, attributes=[DECLARATION]]");
}
private void assertHighlights(String code, String... expected) { private void assertHighlights(String code, String... expected) {
List<String> completions = computeHighlights(code); List<String> completions = computeHighlights(code);
assertEquals(Arrays.asList(expected), completions, "Input: " + code + ", " + completions.toString()); assertEquals(Arrays.asList(expected), completions, "Input: " + code + ", " + completions.toString());
@ -134,7 +141,6 @@ public class SnippetHighlightTest extends KullaTesting {
getAnalysis().highlights(code); getAnalysis().highlights(code);
return highlights.stream() return highlights.stream()
.map(h -> h.toString()) .map(h -> h.toString())
.distinct()
.collect(Collectors.toList()); .collect(Collectors.toList());
} }
} }