diff --git a/java/java-tests/testData/psi/parser-partial/modules/BadContent.txt b/java/java-tests/testData/psi/parser-partial/modules/BadContent.txt index 0c8edba8bde8..b8f8c59bd508 100644 --- a/java/java-tests/testData/psi/parser-partial/modules/BadContent.txt +++ b/java/java-tests/testData/psi/parser-partial/modules/BadContent.txt @@ -1,6 +1,6 @@ PsiJavaFile:BadContent.java PsiJavaModule:X - PsiJavaToken:MODULE('module') + PsiKeyword:module('module') PsiWhiteSpace(' ') PsiJavaModuleReference PsiIdentifier:X('X') diff --git a/java/java-tests/testData/psi/parser-partial/modules/Exports0.txt b/java/java-tests/testData/psi/parser-partial/modules/Exports0.txt index 46f833af26b0..c00a705c9d13 100644 --- a/java/java-tests/testData/psi/parser-partial/modules/Exports0.txt +++ b/java/java-tests/testData/psi/parser-partial/modules/Exports0.txt @@ -1,6 +1,6 @@ PsiJavaFile:Exports0.java PsiJavaModule:M - PsiJavaToken:MODULE('module') + PsiKeyword:module('module') PsiWhiteSpace(' ') PsiJavaModuleReference PsiIdentifier:M('M') @@ -8,7 +8,7 @@ PsiJavaFile:Exports0.java PsiJavaToken:LBRACE('{') PsiWhiteSpace(' ') PsiExportsStatement - PsiJavaToken:EXPORTS('exports') + PsiKeyword:exports('exports') PsiErrorElement:Package reference expected PsiWhiteSpace(' ') diff --git a/java/java-tests/testData/psi/parser-partial/modules/Exports1.txt b/java/java-tests/testData/psi/parser-partial/modules/Exports1.txt index acc74270595d..b4fd84b746c1 100644 --- a/java/java-tests/testData/psi/parser-partial/modules/Exports1.txt +++ b/java/java-tests/testData/psi/parser-partial/modules/Exports1.txt @@ -1,6 +1,6 @@ PsiJavaFile:Exports1.java PsiJavaModule:M - PsiJavaToken:MODULE('module') + PsiKeyword:module('module') PsiWhiteSpace(' ') PsiJavaModuleReference PsiIdentifier:M('M') @@ -8,7 +8,7 @@ PsiJavaFile:Exports1.java PsiJavaToken:LBRACE('{') PsiWhiteSpace(' ') PsiExportsStatement - PsiJavaToken:EXPORTS('exports') + PsiKeyword:exports('exports') PsiWhiteSpace(' ') PsiJavaCodeReferenceElement:pkg PsiIdentifier:pkg('pkg') diff --git a/java/java-tests/testData/psi/parser-partial/modules/Exports2.txt b/java/java-tests/testData/psi/parser-partial/modules/Exports2.txt index 00c8c8eaea70..5009ca88ed19 100644 --- a/java/java-tests/testData/psi/parser-partial/modules/Exports2.txt +++ b/java/java-tests/testData/psi/parser-partial/modules/Exports2.txt @@ -1,6 +1,6 @@ PsiJavaFile:Exports2.java PsiJavaModule:M - PsiJavaToken:MODULE('module') + PsiKeyword:module('module') PsiWhiteSpace(' ') PsiJavaModuleReference PsiIdentifier:M('M') @@ -8,7 +8,7 @@ PsiJavaFile:Exports2.java PsiJavaToken:LBRACE('{') PsiWhiteSpace(' ') PsiExportsStatement - PsiJavaToken:EXPORTS('exports') + PsiKeyword:exports('exports') PsiWhiteSpace(' ') PsiJavaCodeReferenceElement:pkg PsiIdentifier:pkg('pkg') diff --git a/java/java-tests/testData/psi/parser-partial/modules/Exports3.txt b/java/java-tests/testData/psi/parser-partial/modules/Exports3.txt index 0c6e63a95ebe..517d67efff4d 100644 --- a/java/java-tests/testData/psi/parser-partial/modules/Exports3.txt +++ b/java/java-tests/testData/psi/parser-partial/modules/Exports3.txt @@ -1,6 +1,6 @@ PsiJavaFile:Exports3.java PsiJavaModule:M - PsiJavaToken:MODULE('module') + PsiKeyword:module('module') PsiWhiteSpace(' ') PsiJavaModuleReference PsiIdentifier:M('M') @@ -8,14 +8,14 @@ PsiJavaFile:Exports3.java PsiJavaToken:LBRACE('{') PsiWhiteSpace(' ') PsiExportsStatement - PsiJavaToken:EXPORTS('exports') + PsiKeyword:exports('exports') PsiWhiteSpace(' ') PsiJavaCodeReferenceElement:pkg PsiIdentifier:pkg('pkg') PsiReferenceParameterList PsiWhiteSpace(' ') - PsiJavaToken:TO('to') + PsiKeyword:to('to') PsiErrorElement:Identifier expected PsiWhiteSpace(' ') diff --git a/java/java-tests/testData/psi/parser-partial/modules/Exports4.txt b/java/java-tests/testData/psi/parser-partial/modules/Exports4.txt index ceca4753f083..b1fbdf7159a3 100644 --- a/java/java-tests/testData/psi/parser-partial/modules/Exports4.txt +++ b/java/java-tests/testData/psi/parser-partial/modules/Exports4.txt @@ -1,6 +1,6 @@ PsiJavaFile:Exports4.java PsiJavaModule:M - PsiJavaToken:MODULE('module') + PsiKeyword:module('module') PsiWhiteSpace(' ') PsiJavaModuleReference PsiIdentifier:M('M') @@ -8,14 +8,14 @@ PsiJavaFile:Exports4.java PsiJavaToken:LBRACE('{') PsiWhiteSpace(' ') PsiExportsStatement - PsiJavaToken:EXPORTS('exports') + PsiKeyword:exports('exports') PsiWhiteSpace(' ') PsiJavaCodeReferenceElement:pkg PsiIdentifier:pkg('pkg') PsiReferenceParameterList PsiWhiteSpace(' ') - PsiJavaToken:TO('to') + PsiKeyword:to('to') PsiErrorElement:Identifier expected PsiWhiteSpace(' ') diff --git a/java/java-tests/testData/psi/parser-partial/modules/Exports5.txt b/java/java-tests/testData/psi/parser-partial/modules/Exports5.txt index f31ddeb83702..b8105cf4de28 100644 --- a/java/java-tests/testData/psi/parser-partial/modules/Exports5.txt +++ b/java/java-tests/testData/psi/parser-partial/modules/Exports5.txt @@ -1,6 +1,6 @@ PsiJavaFile:Exports5.java PsiJavaModule:M - PsiJavaToken:MODULE('module') + PsiKeyword:module('module') PsiWhiteSpace(' ') PsiJavaModuleReference PsiIdentifier:M('M') @@ -8,14 +8,14 @@ PsiJavaFile:Exports5.java PsiJavaToken:LBRACE('{') PsiWhiteSpace(' ') PsiExportsStatement - PsiJavaToken:EXPORTS('exports') + PsiKeyword:exports('exports') PsiWhiteSpace(' ') PsiJavaCodeReferenceElement:pkg PsiIdentifier:pkg('pkg') PsiReferenceParameterList PsiWhiteSpace(' ') - PsiJavaToken:TO('to') + PsiKeyword:to('to') PsiWhiteSpace(' ') PsiJavaModuleReference PsiIdentifier:A('A') diff --git a/java/java-tests/testData/psi/parser-partial/modules/Exports6.txt b/java/java-tests/testData/psi/parser-partial/modules/Exports6.txt index 6fa00082ba8d..204a82807b2e 100644 --- a/java/java-tests/testData/psi/parser-partial/modules/Exports6.txt +++ b/java/java-tests/testData/psi/parser-partial/modules/Exports6.txt @@ -1,6 +1,6 @@ PsiJavaFile:Exports6.java PsiJavaModule:M - PsiJavaToken:MODULE('module') + PsiKeyword:module('module') PsiWhiteSpace(' ') PsiJavaModuleReference PsiIdentifier:M('M') @@ -8,14 +8,14 @@ PsiJavaFile:Exports6.java PsiJavaToken:LBRACE('{') PsiWhiteSpace(' ') PsiExportsStatement - PsiJavaToken:EXPORTS('exports') + PsiKeyword:exports('exports') PsiWhiteSpace(' ') PsiJavaCodeReferenceElement:pkg PsiIdentifier:pkg('pkg') PsiReferenceParameterList PsiWhiteSpace(' ') - PsiJavaToken:TO('to') + PsiKeyword:to('to') PsiWhiteSpace(' ') PsiJavaModuleReference PsiIdentifier:A('A') diff --git a/java/java-tests/testData/psi/parser-partial/modules/Exports7.txt b/java/java-tests/testData/psi/parser-partial/modules/Exports7.txt index f052e44ce77e..58b0fef9b183 100644 --- a/java/java-tests/testData/psi/parser-partial/modules/Exports7.txt +++ b/java/java-tests/testData/psi/parser-partial/modules/Exports7.txt @@ -1,6 +1,6 @@ PsiJavaFile:Exports7.java PsiJavaModule:M - PsiJavaToken:MODULE('module') + PsiKeyword:module('module') PsiWhiteSpace(' ') PsiJavaModuleReference PsiIdentifier:M('M') @@ -8,14 +8,14 @@ PsiJavaFile:Exports7.java PsiJavaToken:LBRACE('{') PsiWhiteSpace(' ') PsiExportsStatement - PsiJavaToken:EXPORTS('exports') + PsiKeyword:exports('exports') PsiWhiteSpace(' ') PsiJavaCodeReferenceElement:pkg PsiIdentifier:pkg('pkg') PsiReferenceParameterList PsiWhiteSpace(' ') - PsiJavaToken:TO('to') + PsiKeyword:to('to') PsiWhiteSpace(' ') PsiJavaModuleReference PsiIdentifier:A('A') diff --git a/java/java-tests/testData/psi/parser-partial/modules/Exports8.txt b/java/java-tests/testData/psi/parser-partial/modules/Exports8.txt index e35e85070cbb..780a100fa321 100644 --- a/java/java-tests/testData/psi/parser-partial/modules/Exports8.txt +++ b/java/java-tests/testData/psi/parser-partial/modules/Exports8.txt @@ -1,6 +1,6 @@ PsiJavaFile:Exports8.java PsiJavaModule:M - PsiJavaToken:MODULE('module') + PsiKeyword:module('module') PsiWhiteSpace(' ') PsiJavaModuleReference PsiIdentifier:M('M') @@ -8,14 +8,14 @@ PsiJavaFile:Exports8.java PsiJavaToken:LBRACE('{') PsiWhiteSpace(' ') PsiExportsStatement - PsiJavaToken:EXPORTS('exports') + PsiKeyword:exports('exports') PsiWhiteSpace(' ') PsiJavaCodeReferenceElement:pkg PsiIdentifier:pkg('pkg') PsiReferenceParameterList PsiWhiteSpace(' ') - PsiJavaToken:TO('to') + PsiKeyword:to('to') PsiErrorElement:Identifier expected PsiWhiteSpace(' ') diff --git a/java/java-tests/testData/psi/parser-partial/modules/Extras.txt b/java/java-tests/testData/psi/parser-partial/modules/Extras.txt index d4dabd133837..396db166a9fa 100644 --- a/java/java-tests/testData/psi/parser-partial/modules/Extras.txt +++ b/java/java-tests/testData/psi/parser-partial/modules/Extras.txt @@ -1,6 +1,6 @@ PsiJavaFile:Extras.java PsiJavaModule:one - PsiJavaToken:MODULE('module') + PsiKeyword:module('module') PsiWhiteSpace(' ') PsiJavaModuleReference PsiIdentifier:one('one') diff --git a/java/java-tests/testData/psi/parser-partial/modules/Incomplete0.txt b/java/java-tests/testData/psi/parser-partial/modules/Incomplete0.txt index a115ffccaa78..a80974a6f49c 100644 --- a/java/java-tests/testData/psi/parser-partial/modules/Incomplete0.txt +++ b/java/java-tests/testData/psi/parser-partial/modules/Incomplete0.txt @@ -1,4 +1,4 @@ PsiJavaFile:Incomplete0.java - PsiJavaToken:MODULE('module') + PsiKeyword:module('module') PsiErrorElement:Identifier expected \ No newline at end of file diff --git a/java/java-tests/testData/psi/parser-partial/modules/Incomplete1.txt b/java/java-tests/testData/psi/parser-partial/modules/Incomplete1.txt index 76d1f3b04fb1..81f212a0de8a 100644 --- a/java/java-tests/testData/psi/parser-partial/modules/Incomplete1.txt +++ b/java/java-tests/testData/psi/parser-partial/modules/Incomplete1.txt @@ -1,6 +1,6 @@ PsiJavaFile:Incomplete1.java PsiJavaModule:X - PsiJavaToken:MODULE('module') + PsiKeyword:module('module') PsiWhiteSpace(' ') PsiJavaModuleReference PsiIdentifier:X('X') diff --git a/java/java-tests/testData/psi/parser-partial/modules/Incomplete2.txt b/java/java-tests/testData/psi/parser-partial/modules/Incomplete2.txt index 4bd58ed245ee..2c2d6b18cae6 100644 --- a/java/java-tests/testData/psi/parser-partial/modules/Incomplete2.txt +++ b/java/java-tests/testData/psi/parser-partial/modules/Incomplete2.txt @@ -1,5 +1,5 @@ PsiJavaFile:Incomplete2.java - PsiJavaToken:MODULE('module') + PsiKeyword:module('module') PsiWhiteSpace(' ') PsiErrorElement:Module declaration expected PsiJavaToken:LBRACE('{') \ No newline at end of file diff --git a/java/java-tests/testData/psi/parser-partial/modules/Incomplete3.txt b/java/java-tests/testData/psi/parser-partial/modules/Incomplete3.txt index 375820a76067..7ca92eda6292 100644 --- a/java/java-tests/testData/psi/parser-partial/modules/Incomplete3.txt +++ b/java/java-tests/testData/psi/parser-partial/modules/Incomplete3.txt @@ -1,6 +1,6 @@ PsiJavaFile:Incomplete3.java PsiJavaModule:X - PsiJavaToken:MODULE('module') + PsiKeyword:module('module') PsiWhiteSpace(' ') PsiJavaModuleReference PsiIdentifier:X('X') diff --git a/java/java-tests/testData/psi/parser-partial/modules/Incomplete4.txt b/java/java-tests/testData/psi/parser-partial/modules/Incomplete4.txt index 7c2c98c94a13..2b0c45708c3b 100644 --- a/java/java-tests/testData/psi/parser-partial/modules/Incomplete4.txt +++ b/java/java-tests/testData/psi/parser-partial/modules/Incomplete4.txt @@ -1,6 +1,6 @@ PsiJavaFile:Incomplete4.java PsiJavaModule:X - PsiJavaToken:MODULE('module') + PsiKeyword:module('module') PsiWhiteSpace(' ') PsiJavaModuleReference PsiIdentifier:X('X') diff --git a/java/java-tests/testData/psi/parser-partial/modules/Name0.txt b/java/java-tests/testData/psi/parser-partial/modules/Name0.txt index 3f6ddaa81daf..b9d1eb1c7a3b 100644 --- a/java/java-tests/testData/psi/parser-partial/modules/Name0.txt +++ b/java/java-tests/testData/psi/parser-partial/modules/Name0.txt @@ -1,6 +1,6 @@ PsiJavaFile:Name0.java PsiJavaModule:A. - PsiJavaToken:MODULE('module') + PsiKeyword:module('module') PsiWhiteSpace(' ') PsiJavaModuleReference PsiIdentifier:A('A') diff --git a/java/java-tests/testData/psi/parser-partial/modules/Name1.txt b/java/java-tests/testData/psi/parser-partial/modules/Name1.txt index 2b0e29e26f81..5bad3c9f4ff0 100644 --- a/java/java-tests/testData/psi/parser-partial/modules/Name1.txt +++ b/java/java-tests/testData/psi/parser-partial/modules/Name1.txt @@ -1,6 +1,6 @@ PsiJavaFile:Name1.java PsiJavaModule:A..B - PsiJavaToken:MODULE('module') + PsiKeyword:module('module') PsiWhiteSpace(' ') PsiJavaModuleReference PsiIdentifier:A('A') diff --git a/java/java-tests/testData/psi/parser-partial/modules/Name2.txt b/java/java-tests/testData/psi/parser-partial/modules/Name2.txt index 2e7c1fbd38c0..da0c180391f1 100644 --- a/java/java-tests/testData/psi/parser-partial/modules/Name2.txt +++ b/java/java-tests/testData/psi/parser-partial/modules/Name2.txt @@ -1,6 +1,6 @@ PsiJavaFile:Name2.java PsiJavaModule:AB - PsiJavaToken:MODULE('module') + PsiKeyword:module('module') PsiWhiteSpace(' ') PsiJavaModuleReference PsiIdentifier:A('A') diff --git a/java/java-tests/testData/psi/parser-partial/modules/Provides0.txt b/java/java-tests/testData/psi/parser-partial/modules/Provides0.txt index a63de1c5c189..6ec138ac9868 100644 --- a/java/java-tests/testData/psi/parser-partial/modules/Provides0.txt +++ b/java/java-tests/testData/psi/parser-partial/modules/Provides0.txt @@ -1,6 +1,6 @@ PsiJavaFile:Provides0.java PsiJavaModule:M - PsiJavaToken:MODULE('module') + PsiKeyword:module('module') PsiWhiteSpace(' ') PsiJavaModuleReference PsiIdentifier:M('M') @@ -8,7 +8,7 @@ PsiJavaFile:Provides0.java PsiJavaToken:LBRACE('{') PsiWhiteSpace(' ') PsiProvidesStatement - PsiJavaToken:PROVIDES('provides') + PsiKeyword:provides('provides') PsiErrorElement:Class reference expected PsiWhiteSpace(' ') diff --git a/java/java-tests/testData/psi/parser-partial/modules/Provides1.txt b/java/java-tests/testData/psi/parser-partial/modules/Provides1.txt index dab8dc6c0e27..8c10a032550b 100644 --- a/java/java-tests/testData/psi/parser-partial/modules/Provides1.txt +++ b/java/java-tests/testData/psi/parser-partial/modules/Provides1.txt @@ -1,6 +1,6 @@ PsiJavaFile:Provides1.java PsiJavaModule:M - PsiJavaToken:MODULE('module') + PsiKeyword:module('module') PsiWhiteSpace(' ') PsiJavaModuleReference PsiIdentifier:M('M') @@ -8,7 +8,7 @@ PsiJavaFile:Provides1.java PsiJavaToken:LBRACE('{') PsiWhiteSpace(' ') PsiProvidesStatement - PsiJavaToken:PROVIDES('provides') + PsiKeyword:provides('provides') PsiWhiteSpace(' ') PsiJavaCodeReferenceElement:Spi PsiIdentifier:Spi('Spi') diff --git a/java/java-tests/testData/psi/parser-partial/modules/Provides2.txt b/java/java-tests/testData/psi/parser-partial/modules/Provides2.txt index e7af748a4dc5..10718b06e4ad 100644 --- a/java/java-tests/testData/psi/parser-partial/modules/Provides2.txt +++ b/java/java-tests/testData/psi/parser-partial/modules/Provides2.txt @@ -1,6 +1,6 @@ PsiJavaFile:Provides2.java PsiJavaModule:M - PsiJavaToken:MODULE('module') + PsiKeyword:module('module') PsiWhiteSpace(' ') PsiJavaModuleReference PsiIdentifier:M('M') @@ -8,7 +8,7 @@ PsiJavaFile:Provides2.java PsiJavaToken:LBRACE('{') PsiWhiteSpace(' ') PsiProvidesStatement - PsiJavaToken:PROVIDES('provides') + PsiKeyword:provides('provides') PsiWhiteSpace(' ') PsiJavaCodeReferenceElement:Spi PsiIdentifier:Spi('Spi') diff --git a/java/java-tests/testData/psi/parser-partial/modules/Provides3.txt b/java/java-tests/testData/psi/parser-partial/modules/Provides3.txt index d0172f53d309..91ee40594fa4 100644 --- a/java/java-tests/testData/psi/parser-partial/modules/Provides3.txt +++ b/java/java-tests/testData/psi/parser-partial/modules/Provides3.txt @@ -1,6 +1,6 @@ PsiJavaFile:Provides3.java PsiJavaModule:M - PsiJavaToken:MODULE('module') + PsiKeyword:module('module') PsiWhiteSpace(' ') PsiJavaModuleReference PsiIdentifier:M('M') @@ -8,14 +8,14 @@ PsiJavaFile:Provides3.java PsiJavaToken:LBRACE('{') PsiWhiteSpace(' ') PsiProvidesStatement - PsiJavaToken:PROVIDES('provides') + PsiKeyword:provides('provides') PsiWhiteSpace(' ') PsiJavaCodeReferenceElement:Spi PsiIdentifier:Spi('Spi') PsiReferenceParameterList PsiWhiteSpace(' ') - PsiJavaToken:WITH('with') + PsiKeyword:with('with') PsiErrorElement:Class reference expected PsiWhiteSpace(' ') diff --git a/java/java-tests/testData/psi/parser-partial/modules/Provides4.txt b/java/java-tests/testData/psi/parser-partial/modules/Provides4.txt index 69082e177934..d7cef1bebdae 100644 --- a/java/java-tests/testData/psi/parser-partial/modules/Provides4.txt +++ b/java/java-tests/testData/psi/parser-partial/modules/Provides4.txt @@ -1,6 +1,6 @@ PsiJavaFile:Provides4.java PsiJavaModule:M - PsiJavaToken:MODULE('module') + PsiKeyword:module('module') PsiWhiteSpace(' ') PsiJavaModuleReference PsiIdentifier:M('M') @@ -8,14 +8,14 @@ PsiJavaFile:Provides4.java PsiJavaToken:LBRACE('{') PsiWhiteSpace(' ') PsiProvidesStatement - PsiJavaToken:PROVIDES('provides') + PsiKeyword:provides('provides') PsiWhiteSpace(' ') PsiJavaCodeReferenceElement:Spi PsiIdentifier:Spi('Spi') PsiReferenceParameterList PsiWhiteSpace(' ') - PsiJavaToken:WITH('with') + PsiKeyword:with('with') PsiErrorElement:Class reference expected PsiWhiteSpace(' ') diff --git a/java/java-tests/testData/psi/parser-partial/modules/Provides5.txt b/java/java-tests/testData/psi/parser-partial/modules/Provides5.txt index fe2e9440b2ad..bec8663133d9 100644 --- a/java/java-tests/testData/psi/parser-partial/modules/Provides5.txt +++ b/java/java-tests/testData/psi/parser-partial/modules/Provides5.txt @@ -1,6 +1,6 @@ PsiJavaFile:Provides5.java PsiJavaModule:M - PsiJavaToken:MODULE('module') + PsiKeyword:module('module') PsiWhiteSpace(' ') PsiJavaModuleReference PsiIdentifier:M('M') @@ -8,14 +8,14 @@ PsiJavaFile:Provides5.java PsiJavaToken:LBRACE('{') PsiWhiteSpace(' ') PsiProvidesStatement - PsiJavaToken:PROVIDES('provides') + PsiKeyword:provides('provides') PsiWhiteSpace(' ') PsiJavaCodeReferenceElement:Spi PsiIdentifier:Spi('Spi') PsiReferenceParameterList PsiWhiteSpace(' ') - PsiJavaToken:WITH('with') + PsiKeyword:with('with') PsiWhiteSpace(' ') PsiJavaCodeReferenceElement:Impl PsiIdentifier:Impl('Impl') diff --git a/java/java-tests/testData/psi/parser-partial/modules/Provides6.txt b/java/java-tests/testData/psi/parser-partial/modules/Provides6.txt index 57bf910a554c..50a7e2928fb8 100644 --- a/java/java-tests/testData/psi/parser-partial/modules/Provides6.txt +++ b/java/java-tests/testData/psi/parser-partial/modules/Provides6.txt @@ -1,6 +1,6 @@ PsiJavaFile:Provides6.java PsiJavaModule:M - PsiJavaToken:MODULE('module') + PsiKeyword:module('module') PsiWhiteSpace(' ') PsiJavaModuleReference PsiIdentifier:M('M') @@ -8,14 +8,14 @@ PsiJavaFile:Provides6.java PsiJavaToken:LBRACE('{') PsiWhiteSpace(' ') PsiProvidesStatement - PsiJavaToken:PROVIDES('provides') + PsiKeyword:provides('provides') PsiWhiteSpace(' ') PsiJavaCodeReferenceElement:Spi PsiIdentifier:Spi('Spi') PsiReferenceParameterList PsiWhiteSpace(' ') - PsiJavaToken:WITH('with') + PsiKeyword:with('with') PsiWhiteSpace(' ') PsiJavaCodeReferenceElement:Impl PsiIdentifier:Impl('Impl') diff --git a/java/java-tests/testData/psi/parser-partial/modules/Requires0.txt b/java/java-tests/testData/psi/parser-partial/modules/Requires0.txt index c8db19d81e28..21e724c42264 100644 --- a/java/java-tests/testData/psi/parser-partial/modules/Requires0.txt +++ b/java/java-tests/testData/psi/parser-partial/modules/Requires0.txt @@ -1,6 +1,6 @@ PsiJavaFile:Requires0.java PsiJavaModule:M - PsiJavaToken:MODULE('module') + PsiKeyword:module('module') PsiWhiteSpace(' ') PsiJavaModuleReference PsiIdentifier:M('M') @@ -8,7 +8,7 @@ PsiJavaFile:Requires0.java PsiJavaToken:LBRACE('{') PsiWhiteSpace(' ') PsiRequiresStatement - PsiJavaToken:REQUIRES('requires') + PsiKeyword:requires('requires') PsiErrorElement:Identifier expected PsiWhiteSpace(' ') diff --git a/java/java-tests/testData/psi/parser-partial/modules/Requires1.txt b/java/java-tests/testData/psi/parser-partial/modules/Requires1.txt index 307bc7fb10b1..7f94a56601d7 100644 --- a/java/java-tests/testData/psi/parser-partial/modules/Requires1.txt +++ b/java/java-tests/testData/psi/parser-partial/modules/Requires1.txt @@ -1,6 +1,6 @@ PsiJavaFile:Requires1.java PsiJavaModule:M - PsiJavaToken:MODULE('module') + PsiKeyword:module('module') PsiWhiteSpace(' ') PsiJavaModuleReference PsiIdentifier:M('M') @@ -8,7 +8,7 @@ PsiJavaFile:Requires1.java PsiJavaToken:LBRACE('{') PsiWhiteSpace(' ') PsiRequiresStatement - PsiJavaToken:REQUIRES('requires') + PsiKeyword:requires('requires') PsiWhiteSpace(' ') PsiJavaModuleReference PsiIdentifier:X('X') diff --git a/java/java-tests/testData/psi/parser-partial/modules/Requires2.txt b/java/java-tests/testData/psi/parser-partial/modules/Requires2.txt index 986e05584de0..d6ac64b9e903 100644 --- a/java/java-tests/testData/psi/parser-partial/modules/Requires2.txt +++ b/java/java-tests/testData/psi/parser-partial/modules/Requires2.txt @@ -1,6 +1,6 @@ PsiJavaFile:Requires2.java PsiJavaModule:M - PsiJavaToken:MODULE('module') + PsiKeyword:module('module') PsiWhiteSpace(' ') PsiJavaModuleReference PsiIdentifier:M('M') @@ -8,7 +8,7 @@ PsiJavaFile:Requires2.java PsiJavaToken:LBRACE('{') PsiWhiteSpace(' ') PsiRequiresStatement - PsiJavaToken:REQUIRES('requires') + PsiKeyword:requires('requires') PsiWhiteSpace(' ') PsiKeyword:public('public') PsiWhiteSpace(' ') diff --git a/java/java-tests/testData/psi/parser-partial/modules/Requires3.txt b/java/java-tests/testData/psi/parser-partial/modules/Requires3.txt index c4b62e13e8e7..af6548ceb44b 100644 --- a/java/java-tests/testData/psi/parser-partial/modules/Requires3.txt +++ b/java/java-tests/testData/psi/parser-partial/modules/Requires3.txt @@ -1,6 +1,6 @@ PsiJavaFile:Requires3.java PsiJavaModule:M - PsiJavaToken:MODULE('module') + PsiKeyword:module('module') PsiWhiteSpace(' ') PsiJavaModuleReference PsiIdentifier:M('M') @@ -8,7 +8,7 @@ PsiJavaFile:Requires3.java PsiJavaToken:LBRACE('{') PsiWhiteSpace(' ') PsiRequiresStatement - PsiJavaToken:REQUIRES('requires') + PsiKeyword:requires('requires') PsiErrorElement:Identifier expected PsiWhiteSpace(' ') diff --git a/java/java-tests/testData/psi/parser-partial/modules/Requires4.txt b/java/java-tests/testData/psi/parser-partial/modules/Requires4.txt index a02787a01ab5..1390ce9d7974 100644 --- a/java/java-tests/testData/psi/parser-partial/modules/Requires4.txt +++ b/java/java-tests/testData/psi/parser-partial/modules/Requires4.txt @@ -1,6 +1,6 @@ PsiJavaFile:Requires4.java PsiJavaModule:M - PsiJavaToken:MODULE('module') + PsiKeyword:module('module') PsiWhiteSpace(' ') PsiJavaModuleReference PsiIdentifier:M('M') @@ -8,7 +8,7 @@ PsiJavaFile:Requires4.java PsiJavaToken:LBRACE('{') PsiWhiteSpace(' ') PsiRequiresStatement - PsiJavaToken:REQUIRES('requires') + PsiKeyword:requires('requires') PsiWhiteSpace(' ') PsiJavaModuleReference PsiIdentifier:A('A') diff --git a/java/java-tests/testData/psi/parser-partial/modules/Semicolons.txt b/java/java-tests/testData/psi/parser-partial/modules/Semicolons.txt index 1f2ea55c7b8b..6d2ea151d727 100644 --- a/java/java-tests/testData/psi/parser-partial/modules/Semicolons.txt +++ b/java/java-tests/testData/psi/parser-partial/modules/Semicolons.txt @@ -1,6 +1,6 @@ PsiJavaFile:Semicolons.java PsiJavaModule:M - PsiJavaToken:MODULE('module') + PsiKeyword:module('module') PsiWhiteSpace(' ') PsiJavaModuleReference PsiIdentifier:M('M') diff --git a/java/java-tests/testData/psi/parser-partial/modules/Simple0.txt b/java/java-tests/testData/psi/parser-partial/modules/Simple0.txt index 08a9d034bad1..05ed35f89261 100644 --- a/java/java-tests/testData/psi/parser-partial/modules/Simple0.txt +++ b/java/java-tests/testData/psi/parser-partial/modules/Simple0.txt @@ -1,6 +1,6 @@ PsiJavaFile:Simple0.java PsiJavaModule:M1 - PsiJavaToken:MODULE('module') + PsiKeyword:module('module') PsiWhiteSpace(' ') PsiJavaModuleReference PsiIdentifier:M1('M1') diff --git a/java/java-tests/testData/psi/parser-partial/modules/Simple1.txt b/java/java-tests/testData/psi/parser-partial/modules/Simple1.txt index c6aab64bd1ac..0f6a0cdea9c5 100644 --- a/java/java-tests/testData/psi/parser-partial/modules/Simple1.txt +++ b/java/java-tests/testData/psi/parser-partial/modules/Simple1.txt @@ -1,6 +1,6 @@ PsiJavaFile:Simple1.java PsiJavaModule:a.b.c - PsiJavaToken:MODULE('module') + PsiKeyword:module('module') PsiWhiteSpace(' ') PsiJavaModuleReference PsiIdentifier:a('a') diff --git a/java/java-tests/testData/psi/parser-partial/modules/Simple2.txt b/java/java-tests/testData/psi/parser-partial/modules/Simple2.txt index f20dea40cec1..0d063633fd88 100644 --- a/java/java-tests/testData/psi/parser-partial/modules/Simple2.txt +++ b/java/java-tests/testData/psi/parser-partial/modules/Simple2.txt @@ -2,7 +2,7 @@ PsiJavaFile:Simple2.java PsiComment(C_STYLE_COMMENT)('/* comment */') PsiWhiteSpace('\n') PsiJavaModule:X - PsiJavaToken:MODULE('module') + PsiKeyword:module('module') PsiWhiteSpace(' ') PsiJavaModuleReference PsiIdentifier:X('X') diff --git a/java/java-tests/testData/psi/parser-partial/modules/Uses0.txt b/java/java-tests/testData/psi/parser-partial/modules/Uses0.txt index e2cf489836e0..f25790b6488e 100644 --- a/java/java-tests/testData/psi/parser-partial/modules/Uses0.txt +++ b/java/java-tests/testData/psi/parser-partial/modules/Uses0.txt @@ -1,6 +1,6 @@ PsiJavaFile:Uses0.java PsiJavaModule:M - PsiJavaToken:MODULE('module') + PsiKeyword:module('module') PsiWhiteSpace(' ') PsiJavaModuleReference PsiIdentifier:M('M') @@ -8,7 +8,7 @@ PsiJavaFile:Uses0.java PsiJavaToken:LBRACE('{') PsiWhiteSpace(' ') PsiUsesStatement - PsiJavaToken:USES('uses') + PsiKeyword:uses('uses') PsiErrorElement:Class reference expected PsiWhiteSpace(' ') diff --git a/java/java-tests/testData/psi/parser-partial/modules/Uses1.txt b/java/java-tests/testData/psi/parser-partial/modules/Uses1.txt index dd16ad48ff37..e2ae73b60f7a 100644 --- a/java/java-tests/testData/psi/parser-partial/modules/Uses1.txt +++ b/java/java-tests/testData/psi/parser-partial/modules/Uses1.txt @@ -1,6 +1,6 @@ PsiJavaFile:Uses1.java PsiJavaModule:M - PsiJavaToken:MODULE('module') + PsiKeyword:module('module') PsiWhiteSpace(' ') PsiJavaModuleReference PsiIdentifier:M('M') @@ -8,7 +8,7 @@ PsiJavaFile:Uses1.java PsiJavaToken:LBRACE('{') PsiWhiteSpace(' ') PsiUsesStatement - PsiJavaToken:USES('uses') + PsiKeyword:uses('uses') PsiWhiteSpace(' ') PsiJavaCodeReferenceElement:C PsiIdentifier:C('C') diff --git a/java/java-tests/testData/psi/parser-partial/modules/Uses2.txt b/java/java-tests/testData/psi/parser-partial/modules/Uses2.txt index 847ea3f2515b..592240f406f2 100644 --- a/java/java-tests/testData/psi/parser-partial/modules/Uses2.txt +++ b/java/java-tests/testData/psi/parser-partial/modules/Uses2.txt @@ -1,6 +1,6 @@ PsiJavaFile:Uses2.java PsiJavaModule:M - PsiJavaToken:MODULE('module') + PsiKeyword:module('module') PsiWhiteSpace(' ') PsiJavaModuleReference PsiIdentifier:M('M') @@ -8,7 +8,7 @@ PsiJavaFile:Uses2.java PsiJavaToken:LBRACE('{') PsiWhiteSpace(' ') PsiUsesStatement - PsiJavaToken:USES('uses') + PsiKeyword:uses('uses') PsiWhiteSpace(' ') PsiJavaCodeReferenceElement:java.nio.file.spi.FileSystemProvider PsiJavaCodeReferenceElement:java.nio.file.spi