MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-10-01 11:20:44 +07:00
Code Issues Packages Projects Releases Wiki Activity

Java: support top-level var statements in JShell (IDEA-189527)

Browse Source 
GitOrigin-RevId: 7fbf56eff079ad71c5d89d7b1b7f905abc2dba74
This commit is contained in:
Bas Leijdekkers
2024-12-31 15:03:43 +00:00
committed by intellij-monorepo-bot
parent 892d726d1e
commit 970861eb87
6 changed files with 48 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/java-frontback-psi-impl/src/com/intellij/lang/java/parser/BasicDeclarationParser.java
+6 -4
View File
@@ -29,7 +29,7 @@ import static com.intellij.psi.impl.source.BasicElementTypes.*;
@ApiStatus.Experimental
public class BasicDeclarationParser {
public enum BaseContext {
FILE, CLASS, CODE_BLOCK, ANNOTATION_INTERFACE
FILE, CLASS, CODE_BLOCK, ANNOTATION_INTERFACE, JSHELL
}
private static final TokenSet BEFORE_LBRACE_ELEMENTS_SET = TokenSet.create(
@@ -326,7 +326,7 @@ public class BasicDeclarationParser {
PsiBuilder.Marker pos = builder.mark();
int flags = BasicReferenceParser.EAT_LAST_DOT | BasicReferenceParser.WILDCARD;
if (context == BaseContext.CODE_BLOCK) flags |= BasicReferenceParser.VAR_TYPE;
if (context == BaseContext.CODE_BLOCK || context == BaseContext.JSHELL) flags |= BasicReferenceParser.VAR_TYPE;
type = myParser.getReferenceParser().parseTypeInfo(builder, flags);
if (type == null) {
@@ -399,7 +399,8 @@ public class BasicDeclarationParser {
}
if (builder.getTokenType() == JavaTokenType.LPARENTH) {
if (context == BaseContext.CLASS || context == BaseContext.ANNOTATION_INTERFACE || context == BaseContext.FILE) { // method
if (context == BaseContext.CLASS || context == BaseContext.ANNOTATION_INTERFACE || context == BaseContext.FILE
|| context == BaseContext.JSHELL) { // method
if (typeParams == null) {
emptyElement(type.marker, myJavaElementTypeContainer.TYPE_PARAMETER_LIST);
}
@@ -791,7 +792,8 @@ public class BasicDeclarationParser {
int declarationStart,
BaseContext context) {
final IElementType varType;
if (context == BaseContext.CLASS || context == BaseContext.ANNOTATION_INTERFACE || context == BaseContext.FILE) {
if (context == BaseContext.CLASS || context == BaseContext.ANNOTATION_INTERFACE || context == BaseContext.FILE
|| context == BaseContext.JSHELL) {
varType = myJavaElementTypeContainer.FIELD;
}
else if (context == BaseContext.CODE_BLOCK) {