azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Parser: Do not produce qualified expressions without receiver in package directives. Add assertion on JetQualifiedExpression

Browse Source 
#KT-6907 Fixed
This commit is contained in:
Alexey Sedunov
2015-03-05 14:49:29 +03:00
parent cab301e8e2
commit 2684ce20d4
25 changed files with 235 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/testData/psi/packages/PackageBlockFirst.kt
+4
View File
@@ -0,0 +1,4 @@
package foobar {
val a = 1
val b = foobar.a
}
compiler/testData/psi/packages/PackageBlockFirst.txt
+36
View File
@@ -0,0 +1,36 @@
JetFile: PackageBlockFirst.kt
PACKAGE_DIRECTIVE
PsiElement(package)('package')
PsiWhiteSpace(' ')
REFERENCE_EXPRESSION
PsiElement(IDENTIFIER)('foobar')
PsiWhiteSpace(' ')
PsiErrorElement:Expecting a top level declaration
PsiElement(LBRACE)('{')
PsiWhiteSpace('\n ')
PROPERTY
PsiElement(val)('val')
PsiWhiteSpace(' ')
PsiElement(IDENTIFIER)('a')
PsiWhiteSpace(' ')
PsiElement(EQ)('=')
PsiWhiteSpace(' ')
INTEGER_CONSTANT
PsiElement(INTEGER_LITERAL)('1')
PsiWhiteSpace('\n ')
PROPERTY
PsiElement(val)('val')
PsiWhiteSpace(' ')
PsiElement(IDENTIFIER)('b')
PsiWhiteSpace(' ')
PsiElement(EQ)('=')
PsiWhiteSpace(' ')
DOT_QUALIFIED_EXPRESSION
REFERENCE_EXPRESSION
PsiElement(IDENTIFIER)('foobar')
PsiElement(DOT)('.')
REFERENCE_EXPRESSION
PsiElement(IDENTIFIER)('a')
PsiWhiteSpace('\n')
PsiErrorElement:Expecting a top level declaration
PsiElement(RBRACE)('}')
compiler/testData/psi/packages/PackageLeadingDotDoubleID.kt
+1
View File
@@ -0,0 +1 @@
package .a b
compiler/testData/psi/packages/PackageLeadingDotDoubleID.txt
+18
View File
@@ -0,0 +1,18 @@
JetFile: PackageLeadingDotDoubleID.kt
PACKAGE_DIRECTIVE
PsiElement(package)('package')
PsiWhiteSpace(' ')
PsiErrorElement:Package name must be a '.'-separated identifier list
PsiElement(DOT)('.')
REFERENCE_EXPRESSION
PsiElement(IDENTIFIER)('a')
PsiWhiteSpace(' ')
MODIFIER_LIST
ANNOTATION_ENTRY
CONSTRUCTOR_CALLEE
TYPE_REFERENCE
USER_TYPE
REFERENCE_EXPRESSION
PsiElement(IDENTIFIER)('b')
PsiErrorElement:Expecting a top level declaration
<empty list>
compiler/testData/psi/packages/PackageLongNameBetweenDots.kt
+1
View File
@@ -0,0 +1 @@
package .a.b.c.
compiler/testData/psi/packages/PackageLongNameBetweenDots.txt
+19
View File
@@ -0,0 +1,19 @@
JetFile: PackageLongNameBetweenDots.kt
PACKAGE_DIRECTIVE
PsiElement(package)('package')
PsiWhiteSpace(' ')
PsiErrorElement:Package name must be a '.'-separated identifier list
PsiElement(DOT)('.')
DOT_QUALIFIED_EXPRESSION
DOT_QUALIFIED_EXPRESSION
REFERENCE_EXPRESSION
PsiElement(IDENTIFIER)('a')
PsiElement(DOT)('.')
REFERENCE_EXPRESSION
PsiElement(IDENTIFIER)('b')
PsiElement(DOT)('.')
REFERENCE_EXPRESSION
PsiElement(IDENTIFIER)('c')
PsiElement(DOT)('.')
PsiErrorElement:Package name must be a '.'-separated identifier list placed on a single line
<empty list>
compiler/testData/psi/packages/PackageLongNameDoubleID.kt
+1
View File
@@ -0,0 +1 @@
package a b
compiler/testData/psi/packages/PackageLongNameDoubleID.txt
+16
View File
@@ -0,0 +1,16 @@
JetFile: PackageLongNameDoubleID.kt
PACKAGE_DIRECTIVE
PsiElement(package)('package')
PsiWhiteSpace(' ')
REFERENCE_EXPRESSION
PsiElement(IDENTIFIER)('a')
PsiWhiteSpace(' ')
MODIFIER_LIST
ANNOTATION_ENTRY
CONSTRUCTOR_CALLEE
TYPE_REFERENCE
USER_TYPE
REFERENCE_EXPRESSION
PsiElement(IDENTIFIER)('b')
PsiErrorElement:Expecting a top level declaration
<empty list>
compiler/testData/psi/packages/PackageLongNameLeadingDot.kt
+1
View File
@@ -0,0 +1 @@
package .a.b.c
compiler/testData/psi/packages/PackageLongNameLeadingDot.txt
+16
View File
@@ -0,0 +1,16 @@
JetFile: PackageLongNameLeadingDot.kt
PACKAGE_DIRECTIVE
PsiElement(package)('package')
PsiWhiteSpace(' ')
PsiErrorElement:Package name must be a '.'-separated identifier list
PsiElement(DOT)('.')
DOT_QUALIFIED_EXPRESSION
DOT_QUALIFIED_EXPRESSION
REFERENCE_EXPRESSION
PsiElement(IDENTIFIER)('a')
PsiElement(DOT)('.')
REFERENCE_EXPRESSION
PsiElement(IDENTIFIER)('b')
PsiElement(DOT)('.')
REFERENCE_EXPRESSION
PsiElement(IDENTIFIER)('c')
compiler/testData/psi/packages/PackageLongNameLeadingDoubleDot.kt
+1
View File
@@ -0,0 +1 @@
package . .a.b.c
compiler/testData/psi/packages/PackageLongNameLeadingDoubleDot.txt
+19
View File
@@ -0,0 +1,19 @@
JetFile: PackageLongNameLeadingDoubleDot.kt
PACKAGE_DIRECTIVE
PsiElement(package)('package')
PsiWhiteSpace(' ')
PsiErrorElement:Package name must be a '.'-separated identifier list
PsiElement(DOT)('.')
PsiWhiteSpace(' ')
PsiErrorElement:Package name must be a '.'-separated identifier list
PsiElement(DOT)('.')
DOT_QUALIFIED_EXPRESSION
DOT_QUALIFIED_EXPRESSION
REFERENCE_EXPRESSION
PsiElement(IDENTIFIER)('a')
PsiElement(DOT)('.')
REFERENCE_EXPRESSION
PsiElement(IDENTIFIER)('b')
PsiElement(DOT)('.')
REFERENCE_EXPRESSION
PsiElement(IDENTIFIER)('c')
compiler/testData/psi/packages/PackageModifiers.kt
+1
View File
@@ -0,0 +1 @@
public [a] package name
compiler/testData/psi/packages/PackageModifiers.txt
+19
View File
@@ -0,0 +1,19 @@
JetFile: PackageModifiers.kt
PACKAGE_DIRECTIVE
MODIFIER_LIST
PsiElement(public)('public')
PsiWhiteSpace(' ')
ANNOTATION
PsiElement(LBRACKET)('[')
ANNOTATION_ENTRY
CONSTRUCTOR_CALLEE
TYPE_REFERENCE
USER_TYPE
REFERENCE_EXPRESSION
PsiElement(IDENTIFIER)('a')
PsiElement(RBRACKET)(']')
PsiWhiteSpace(' ')
PsiElement(package)('package')
PsiWhiteSpace(' ')
REFERENCE_EXPRESSION
PsiElement(IDENTIFIER)('name')
compiler/testData/psi/packages/PackageNameDoubleDot.kt
+1
View File
@@ -0,0 +1 @@
package . .
compiler/testData/psi/packages/PackageNameDoubleDot.txt
+11
View File
@@ -0,0 +1,11 @@
JetFile: PackageNameDoubleDot.kt
PACKAGE_DIRECTIVE
PsiElement(package)('package')
PsiWhiteSpace(' ')
PsiErrorElement:Package name must be a '.'-separated identifier list
PsiElement(DOT)('.')
PsiWhiteSpace(' ')
PsiErrorElement:Package name must be a '.'-separated identifier list
PsiElement(DOT)('.')
PsiErrorElement:Package name must be a '.'-separated identifier list placed on a single line
<empty list>
compiler/testData/psi/packages/PackageNameJustDot.kt
+1
View File
@@ -0,0 +1 @@
package .
compiler/testData/psi/packages/PackageNameJustDot.txt
+8
View File
@@ -0,0 +1,8 @@
JetFile: PackageNameJustDot.kt
PACKAGE_DIRECTIVE
PsiElement(package)('package')
PsiWhiteSpace(' ')
PsiErrorElement:Package name must be a '.'-separated identifier list
PsiElement(DOT)('.')
PsiErrorElement:Package name must be a '.'-separated identifier list placed on a single line
<empty list>
compiler/testData/psi/packages/PackageSimpleNameLeadingDot.kt
+1
View File
@@ -0,0 +1 @@
package .a
compiler/testData/psi/packages/PackageSimpleNameLeadingDot.txt
+8
View File
@@ -0,0 +1,8 @@
JetFile: PackageSimpleNameLeadingDot.kt
PACKAGE_DIRECTIVE
PsiElement(package)('package')
PsiWhiteSpace(' ')
PsiErrorElement:Package name must be a '.'-separated identifier list
PsiElement(DOT)('.')
REFERENCE_EXPRESSION
PsiElement(IDENTIFIER)('a')
compiler/testData/psi/packages/PackageSimpleNameLeadingDoubleDot.kt
+1
View File
@@ -0,0 +1 @@
package . .a
compiler/testData/psi/packages/PackageSimpleNameLeadingDoubleDot.txt
+11
View File
@@ -0,0 +1,11 @@
JetFile: PackageSimpleNameLeadingDoubleDot.kt
PACKAGE_DIRECTIVE
PsiElement(package)('package')
PsiWhiteSpace(' ')
PsiErrorElement:Package name must be a '.'-separated identifier list
PsiElement(DOT)('.')
PsiWhiteSpace(' ')
PsiErrorElement:Package name must be a '.'-separated identifier list
PsiElement(DOT)('.')
REFERENCE_EXPRESSION
PsiElement(IDENTIFIER)('a')