MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-03-22 15:19:59 +07:00
Code Issues Packages Projects Releases Wiki Activity

[java, import-module] Refactor import statement hierarchy IDEA-353091

Browse Source 
Extract a top-level abstraction PsiImportDeclaration

GitOrigin-RevId: 04182ba96998fd578723559d86aa5a54ec14de67
This commit is contained in:
Aleksey Dobrynin
2024-07-03 16:44:11 +02:00
committed by intellij-monorepo-bot
parent 32a73fce42
commit 96f16b8f98
23 changed files with 385 additions and 124 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
java/java-frontback-psi-impl/src/com/intellij/psi/impl/source/BasicElementTypes.java
View File

@@ -95,8 +95,10 @@ public interface BasicElementTypes extends JavaTokenType, JavaDocTokenType, Basi
BASIC_PROVIDES_STATEMENT);
ParentAwareTokenSet BASIC_IMPORT_STATEMENT_BASE_BIT_SET = ParentAwareTokenSet.create(BASIC_IMPORT_STATEMENT,
BASIC_IMPORT_STATIC_STATEMENT,
BASIC_IMPORT_MODULE_STATEMENT);
BASIC_IMPORT_STATIC_STATEMENT);
ParentAwareTokenSet BASIC_IMPORT_STATEMENT_DECLARATION_BIT_SET = ParentAwareTokenSet.create(BASIC_IMPORT_STATEMENT,
BASIC_IMPORT_STATIC_STATEMENT,
BASIC_IMPORT_MODULE_STATEMENT);
TokenSet BASIC_CLASS_KEYWORD_BIT_SET =
TokenSet.create(CLASS_KEYWORD, INTERFACE_KEYWORD, ENUM_KEYWORD, RECORD_KEYWORD);
ParentAwareTokenSet BASIC_MEMBER_BIT_SET = ParentAwareTokenSet.create(BASIC_CLASS, BASIC_FIELD, BASIC_ENUM_CONSTANT,

4
java/java-frontback-psi-impl/src/com/intellij/psi/impl/source/WhiteSpaceAndCommentSetHolder.java
View File

@@ -1,4 +1,4 @@
// Copyright 2000-2023 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license.
// Copyright 2000-2024 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license.
package com.intellij.psi.impl.source;
import com.intellij.lang.WhitespacesAndCommentsBinder;
@@ -21,7 +21,7 @@ public class WhiteSpaceAndCommentSetHolder {
BasicElementTypes.BASIC_FULL_MEMBER_BIT_SET);
private static final ParentAwareTokenSet TRAILING_COMMENT_SET =
orSet(create(BasicJavaElementType.BASIC_PACKAGE_STATEMENT), BasicElementTypes.BASIC_IMPORT_STATEMENT_BASE_BIT_SET,
orSet(create(BasicJavaElementType.BASIC_PACKAGE_STATEMENT), BasicElementTypes.BASIC_IMPORT_STATEMENT_DECLARATION_BIT_SET,
BasicElementTypes.BASIC_FULL_MEMBER_BIT_SET, BasicElementTypes.BASIC_JAVA_STATEMENT_BIT_SET);
private WhiteSpaceAndCommentSetHolder() {