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, import-module] Refactor import statement hierarchy IDEA-353091

Browse Source 
IJ-CR-139321

GitOrigin-RevId: f5a2188b18afad7cb2912d3ff282ef9929f20ca6
This commit is contained in:
Aleksey Dobrynin
2024-07-19 12:20:22 +00:00
committed by intellij-monorepo-bot
parent 0fb89ef48e
commit 0a0e345835
25 changed files with 155 additions and 306 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/java-frontback-psi-impl/src/com/intellij/psi/impl/source/BasicElementTypes.java
+2 -4
View File
@@ -95,10 +95,8 @@ 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);
ParentAwareTokenSet BASIC_IMPORT_STATEMENT_DECLARATION_BIT_SET = ParentAwareTokenSet.create(BASIC_IMPORT_STATEMENT,
BASIC_IMPORT_STATIC_STATEMENT,
BASIC_IMPORT_MODULE_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,
java/java-frontback-psi-impl/src/com/intellij/psi/impl/source/WhiteSpaceAndCommentSetHolder.java
+1 -1
View File
@@ -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_DECLARATION_BIT_SET,
orSet(create(BasicJavaElementType.BASIC_PACKAGE_STATEMENT), BasicElementTypes.BASIC_IMPORT_STATEMENT_BASE_BIT_SET,
BasicElementTypes.BASIC_FULL_MEMBER_BIT_SET, BasicElementTypes.BASIC_JAVA_STATEMENT_BIT_SET);
private WhiteSpaceAndCommentSetHolder() {