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

Create import list psi element even if no directives are present

Browse Source 
Fix a problem where deleting last import directive via "optimize imports" could lead to incorrect psi structure resulting in CCE, see EA-64291
New imports are inserted at the head (after package directive if present) of the file (before any comments) if no imports were present
Add test for inserting import to file where a first statement is a comment
Drop code dealing with non-existing import list in ImportInsertHelperImpl
AbstractQuickFixTest: check for unexpected actions before changes to the file are made as it relies on the first line having specific format
This commit is contained in:
Pavel V. Talanov
2015-06-08 15:13:33 +03:00
parent 4c4f730c53
commit 07d35d305e
461 changed files with 1275 additions and 472 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/testData/psi/examples/AnonymousObjects.txt
Vendored
+3 -1
View File
@@ -1,6 +1,8 @@
JetFile: AnonymousObjects.kt
PACKAGE_DIRECTIVE
<empty list>
IMPORT_LIST
<empty list>
FUN
PsiElement(fun)('fun')
PsiWhiteSpace(' ')
@@ -199,4 +201,4 @@ JetFile: AnonymousObjects.kt
PsiElement(RBRACE)('}')
PsiElement(SEMICOLON)(';')
PsiWhiteSpace('\n\n')
PsiElement(RBRACE)('}')
PsiElement(RBRACE)('}')
compiler/testData/psi/examples/BinaryTree.txt
Vendored
+3 -1
View File
@@ -1,6 +1,8 @@
JetFile: BinaryTree.kt
PACKAGE_DIRECTIVE
<empty list>
IMPORT_LIST
<empty list>
CLASS
PsiElement(class)('class')
PsiWhiteSpace(' ')
@@ -2388,4 +2390,4 @@ JetFile: BinaryTree.kt
PsiWhiteSpace('\n ')
PsiElement(RBRACE)('}')
PsiWhiteSpace('\n\n')
PsiElement(RBRACE)('}')
PsiElement(RBRACE)('}')
compiler/testData/psi/examples/BitArith.txt
Vendored
+3 -1
View File
@@ -1,6 +1,8 @@
JetFile: BitArith.kt
PACKAGE_DIRECTIVE
<empty list>
IMPORT_LIST
<empty list>
FUN
PsiElement(fun)('fun')
PsiWhiteSpace(' ')
@@ -622,4 +624,4 @@ JetFile: BitArith.kt
PsiWhiteSpace('\n ')
PsiComment(EOL_COMMENT)('// ...')
PsiWhiteSpace('\n')
PsiElement(RBRACE)('}')
PsiElement(RBRACE)('}')
compiler/testData/psi/examples/Builder.txt
Vendored
+3 -1
View File
@@ -1,6 +1,8 @@
JetFile: Builder.kt
PACKAGE_DIRECTIVE
<empty list>
IMPORT_LIST
<empty list>
PROPERTY
PsiElement(val)('val')
PsiWhiteSpace(' ')
@@ -468,4 +470,4 @@ JetFile: Builder.kt
PsiComment(BLOCK_COMMENT)('/*...*/')
PsiElement(RPAR)(')')
PsiWhiteSpace('\n')
PsiElement(RBRACE)('}')
PsiElement(RBRACE)('}')
compiler/testData/psi/examples/Color.txt
Vendored
+3 -1
View File
@@ -1,6 +1,8 @@
JetFile: Color.kt
PACKAGE_DIRECTIVE
<empty list>
IMPORT_LIST
<empty list>
CLASS
MODIFIER_LIST
PsiElement(enum)('enum')
@@ -143,4 +145,4 @@ JetFile: Color.kt
PsiElement(INTEGER_LITERAL)('255')
PsiElement(RPAR)(')')
PsiWhiteSpace('\n')
PsiElement(RBRACE)('}')
PsiElement(RBRACE)('}')
compiler/testData/psi/examples/FunctionsAndTypes.txt
Vendored
+3 -1
View File
@@ -1,6 +1,8 @@
JetFile: FunctionsAndTypes.kt
PACKAGE_DIRECTIVE
<empty list>
IMPORT_LIST
<empty list>
TYPEDEF
PsiElement(typealias)('typealias')
PsiWhiteSpace(' ')
@@ -646,4 +648,4 @@ JetFile: FunctionsAndTypes.kt
VALUE_ARGUMENT_LIST
PsiElement(LPAR)('(')
PsiElement(RPAR)(')')
PsiElement(RBRACE)('}')
PsiElement(RBRACE)('}')
compiler/testData/psi/examples/Graph.txt
Vendored
+3 -1
View File
@@ -1,6 +1,8 @@
JetFile: Graph.kt
PACKAGE_DIRECTIVE
<empty list>
IMPORT_LIST
<empty list>
CLASS
PsiElement(class)('class')
PsiWhiteSpace(' ')
@@ -989,4 +991,4 @@ JetFile: Graph.kt
PsiWhiteSpace('\n ')
PsiElement(RBRACE)('}')
PsiWhiteSpace('\n')
PsiElement(RBRACE)('}')
PsiElement(RBRACE)('}')
compiler/testData/psi/examples/IPushPop.txt
Vendored
+3 -1
View File
@@ -1,6 +1,8 @@
JetFile: IPushPop.kt
PACKAGE_DIRECTIVE
<empty list>
IMPORT_LIST
<empty list>
CLASS
MODIFIER_LIST
PsiElement(open)('open')
@@ -61,4 +63,4 @@ JetFile: IPushPop.kt
REFERENCE_EXPRESSION
PsiElement(IDENTIFIER)('T')
PsiWhiteSpace('\n')
PsiElement(RBRACE)('}')
PsiElement(RBRACE)('}')
compiler/testData/psi/examples/LINQ.txt
Vendored
+3 -1
View File
@@ -1,6 +1,8 @@
JetFile: LINQ.kt
PACKAGE_DIRECTIVE
<empty list>
IMPORT_LIST
<empty list>
FUN
PsiElement(fun)('fun')
PsiWhiteSpace(' ')
@@ -78,4 +80,4 @@ JetFile: LINQ.kt
PsiElement(IDENTIFIER)('b')
PsiElement(RBRACE)('}')
PsiWhiteSpace('\n')
PsiElement(RBRACE)('}')
PsiElement(RBRACE)('}')
compiler/testData/psi/examples/Queue.txt
Vendored
+3 -1
View File
@@ -1,6 +1,8 @@
JetFile: Queue.kt
PACKAGE_DIRECTIVE
<empty list>
IMPORT_LIST
<empty list>
CLASS
PsiElement(class)('class')
PsiWhiteSpace(' ')
@@ -383,4 +385,4 @@ JetFile: Queue.kt
NULL
PsiElement(null)('null')
PsiWhiteSpace('\n\n\n')
PsiElement(RBRACE)('}')
PsiElement(RBRACE)('}')
compiler/testData/psi/examples/Stack.txt
Vendored
+3 -1
View File
@@ -1,6 +1,8 @@
JetFile: Stack.kt
PACKAGE_DIRECTIVE
<empty list>
IMPORT_LIST
<empty list>
CLASS
PsiElement(class)('class')
PsiWhiteSpace(' ')
@@ -144,4 +146,4 @@ JetFile: Stack.kt
REFERENCE_EXPRESSION
PsiElement(IDENTIFIER)('isEmpty')
PsiWhiteSpace('\n\n')
PsiElement(RBRACE)('}')
PsiElement(RBRACE)('}')
compiler/testData/psi/examples/UnionFind.txt
Vendored
+3 -1
View File
@@ -1,6 +1,8 @@
JetFile: UnionFind.kt
PACKAGE_DIRECTIVE
<empty list>
IMPORT_LIST
<empty list>
CLASS
PsiElement(class)('class')
PsiWhiteSpace(' ')
@@ -396,4 +398,4 @@ JetFile: UnionFind.kt
PsiElement(EXCLEQ)('!=')
PsiWhiteSpace(' ')
INTEGER_CONSTANT
PsiElement(INTEGER_LITERAL)('0')
PsiElement(INTEGER_LITERAL)('0')
compiler/testData/psi/examples/UpdateOperation.txt
Vendored
+3 -1
View File
@@ -1,6 +1,8 @@
JetFile: UpdateOperation.kt
PACKAGE_DIRECTIVE
<empty list>
IMPORT_LIST
<empty list>
CLASS
PsiElement(class)('class')
PsiWhiteSpace(' ')
@@ -234,4 +236,4 @@ JetFile: UpdateOperation.kt
PsiWhiteSpace('\n\n')
PsiComment(EOL_COMMENT)('// Such copy(...) methods can be automatically generated by the compiler')
PsiWhiteSpace('\n')
PsiComment(EOL_COMMENT)('// whenever there is a primary constructor')
PsiComment(EOL_COMMENT)('// whenever there is a primary constructor')
compiler/testData/psi/examples/With.txt
Vendored
+3 -1
View File
@@ -1,6 +1,8 @@
JetFile: With.kt
PACKAGE_DIRECTIVE
<empty list>
IMPORT_LIST
<empty list>
FUN
MODIFIER_LIST
ANNOTATION
@@ -188,4 +190,4 @@ JetFile: With.kt
PsiElement(LPAR)('(')
PsiElement(RPAR)(')')
PsiWhiteSpace('\n\n')
PsiElement(RBRACE)('}')
PsiElement(RBRACE)('}')
compiler/testData/psi/examples/array/MutableArray.txt
Vendored
+3 -1
View File
@@ -1,6 +1,8 @@
JetFile: MutableArray.kt
PACKAGE_DIRECTIVE
<empty list>
IMPORT_LIST
<empty list>
CLASS
KDoc
PsiElement(KDOC_START)('/**')
@@ -190,4 +192,4 @@ JetFile: MutableArray.kt
CLASS_BODY
PsiElement(LBRACE)('{')
PsiComment(BLOCK_COMMENT)('/*...*/')
PsiElement(RBRACE)('}')
PsiElement(RBRACE)('}')
compiler/testData/psi/examples/collections/ArrayList.txt
Vendored
+3 -1
View File
@@ -1,6 +1,8 @@
JetFile: ArrayList.kt
PACKAGE_DIRECTIVE
<empty list>
IMPORT_LIST
<empty list>
CLASS
PsiElement(class)('class')
PsiWhiteSpace(' ')
@@ -897,4 +899,4 @@ JetFile: ArrayList.kt
PsiWhiteSpace('\n ')
PsiElement(RBRACE)('}')
PsiWhiteSpace('\n')
PsiElement(RBRACE)('}')
PsiElement(RBRACE)('}')
compiler/testData/psi/examples/collections/HashMap.txt
Vendored
+3 -1
View File
@@ -1,6 +1,8 @@
JetFile: HashMap.kt
PACKAGE_DIRECTIVE
<empty list>
IMPORT_LIST
<empty list>
CLASS
MODIFIER_LIST
PsiElement(open)('open')
@@ -939,4 +941,4 @@ JetFile: HashMap.kt
PsiWhiteSpace('\n ')
PsiComment(EOL_COMMENT)('//...')
PsiWhiteSpace('\n\n')
PsiElement(RBRACE)('}')
PsiElement(RBRACE)('}')
compiler/testData/psi/examples/collections/IIterable.txt
Vendored
+3 -1
View File
@@ -1,6 +1,8 @@
JetFile: IIterable.kt
PACKAGE_DIRECTIVE
<empty list>
IMPORT_LIST
<empty list>
CLASS
MODIFIER_LIST
PsiElement(open)('open')
@@ -43,4 +45,4 @@ JetFile: IIterable.kt
PsiElement(IDENTIFIER)('T')
PsiElement(GT)('>')
PsiWhiteSpace('\n')
PsiElement(RBRACE)('}')
PsiElement(RBRACE)('}')
compiler/testData/psi/examples/collections/IIterator.txt
Vendored
+3 -1
View File
@@ -1,6 +1,8 @@
JetFile: IIterator.kt
PACKAGE_DIRECTIVE
<empty list>
IMPORT_LIST
<empty list>
CLASS
MODIFIER_LIST
PsiElement(open)('open')
@@ -396,4 +398,4 @@ JetFile: IIterator.kt
PsiWhiteSpace('\n ')
PsiElement(RBRACE)('}')
PsiWhiteSpace('\n')
PsiElement(RBRACE)('}')
PsiElement(RBRACE)('}')
compiler/testData/psi/examples/collections/IList.txt
Vendored
+3 -1
View File
@@ -1,6 +1,8 @@
JetFile: IList.kt
PACKAGE_DIRECTIVE
<empty list>
IMPORT_LIST
<empty list>
CLASS
MODIFIER_LIST
PsiElement(open)('open')
@@ -91,4 +93,4 @@ JetFile: IList.kt
REFERENCE_EXPRESSION
PsiElement(IDENTIFIER)('Boolean')
PsiWhiteSpace('\n')
PsiElement(RBRACE)('}')
PsiElement(RBRACE)('}')
compiler/testData/psi/examples/collections/IMutableIterable.txt
Vendored
+3 -1
View File
@@ -1,6 +1,8 @@
JetFile: IMutableIterable.kt
PACKAGE_DIRECTIVE
<empty list>
IMPORT_LIST
<empty list>
CLASS
MODIFIER_LIST
PsiElement(open)('open')
@@ -60,4 +62,4 @@ JetFile: IMutableIterable.kt
PsiElement(IDENTIFIER)('T')
PsiElement(GT)('>')
PsiWhiteSpace('\n')
PsiElement(RBRACE)('}')
PsiElement(RBRACE)('}')
compiler/testData/psi/examples/collections/IMutableIterator.txt
Vendored
+3 -1
View File
@@ -1,6 +1,8 @@
JetFile: IMutableIterator.kt
PACKAGE_DIRECTIVE
<empty list>
IMPORT_LIST
<empty list>
CLASS
MODIFIER_LIST
PsiElement(open)('open')
@@ -54,4 +56,4 @@ JetFile: IMutableIterator.kt
PsiWhiteSpace('\n\n')
PsiComment(BLOCK_COMMENT)('/*\n Considerations:\n pro: why not + non iteration breaking\n con: counter-intuitive for, e.g., TreeSet\n\n\n fun addBefore(item : T) : Boolean\n fun addAfter(item : T) : Boolean\n*/')
PsiWhiteSpace('\n')
PsiElement(RBRACE)('}')
PsiElement(RBRACE)('}')
compiler/testData/psi/examples/collections/IMutableList.txt
Vendored
+3 -1
View File
@@ -1,6 +1,8 @@
JetFile: IMutableList.kt
PACKAGE_DIRECTIVE
<empty list>
IMPORT_LIST
<empty list>
CLASS
MODIFIER_LIST
PsiElement(open)('open')
@@ -159,4 +161,4 @@ JetFile: IMutableList.kt
PsiElement(IDENTIFIER)('T')
PsiElement(GT)('>')
PsiWhiteSpace('\n')
PsiElement(RBRACE)('}')
PsiElement(RBRACE)('}')
compiler/testData/psi/examples/collections/IMutableSet.txt
Vendored
+3 -1
View File
@@ -1,6 +1,8 @@
JetFile: IMutableSet.kt
PACKAGE_DIRECTIVE
<empty list>
IMPORT_LIST
<empty list>
CLASS
MODIFIER_LIST
PsiElement(open)('open')
@@ -97,4 +99,4 @@ JetFile: IMutableSet.kt
REFERENCE_EXPRESSION
PsiElement(IDENTIFIER)('Boolean')
PsiWhiteSpace('\n')
PsiElement(RBRACE)('}')
PsiElement(RBRACE)('}')
compiler/testData/psi/examples/collections/ISet.txt
Vendored
+3 -1
View File
@@ -1,6 +1,8 @@
JetFile: ISet.kt
PACKAGE_DIRECTIVE
<empty list>
IMPORT_LIST
<empty list>
CLASS
MODIFIER_LIST
PsiElement(open)('open')
@@ -65,4 +67,4 @@ JetFile: ISet.kt
REFERENCE_EXPRESSION
PsiElement(IDENTIFIER)('Boolean')
PsiWhiteSpace('\n')
PsiElement(RBRACE)('}')
PsiElement(RBRACE)('}')
compiler/testData/psi/examples/collections/ISized.txt
Vendored
+3 -1
View File
@@ -1,6 +1,8 @@
JetFile: ISized.kt
PACKAGE_DIRECTIVE
<empty list>
IMPORT_LIST
<empty list>
CLASS
MODIFIER_LIST
PsiElement(open)('open')
@@ -24,4 +26,4 @@ JetFile: ISized.kt
REFERENCE_EXPRESSION
PsiElement(IDENTIFIER)('Int')
PsiWhiteSpace('\n')
PsiElement(RBRACE)('}')
PsiElement(RBRACE)('}')
compiler/testData/psi/examples/collections/LinkedList.txt
Vendored
+3 -1
View File
@@ -1,6 +1,8 @@
JetFile: LinkedList.kt
PACKAGE_DIRECTIVE
<empty list>
IMPORT_LIST
<empty list>
CLASS
PsiElement(class)('class')
PsiWhiteSpace(' ')
@@ -893,4 +895,4 @@ JetFile: LinkedList.kt
PsiElement(IDENTIFIER)('T')
PsiElement(GT)('>')
PsiWhiteSpace('\n')
PsiElement(RBRACE)('}')
PsiElement(RBRACE)('}')
compiler/testData/psi/examples/io/IOSamples.txt
Vendored
+3 -1
View File
@@ -1,6 +1,8 @@
JetFile: IOSamples.kt
PACKAGE_DIRECTIVE
<empty list>
IMPORT_LIST
<empty list>
CLASS
MODIFIER_LIST
PsiElement(open)('open')
@@ -597,4 +599,4 @@ JetFile: IOSamples.kt
PsiWhiteSpace(' ')
PsiComment(EOL_COMMENT)('// throws IOException, you must catch or rethrow explicitly')
PsiWhiteSpace('\n\n')
PsiElement(RBRACE)('}')
PsiElement(RBRACE)('}')
compiler/testData/psi/examples/map/IMap.txt
Vendored
+3 -1
View File
@@ -1,6 +1,8 @@
JetFile: IMap.kt
PACKAGE_DIRECTIVE
<empty list>
IMPORT_LIST
<empty list>
CLASS
MODIFIER_LIST
PsiElement(open)('open')
@@ -27,4 +29,4 @@ JetFile: IMap.kt
CLASS_BODY
PsiElement(LBRACE)('{')
PsiWhiteSpace('\n \n\n')
PsiElement(RBRACE)('}')
PsiElement(RBRACE)('}')
compiler/testData/psi/examples/priorityqueues/BinaryHeap.txt
Vendored
+3 -1
View File
@@ -1,6 +1,8 @@
JetFile: BinaryHeap.kt
PACKAGE_DIRECTIVE
<empty list>
IMPORT_LIST
<empty list>
CLASS
PsiElement(class)('class')
PsiWhiteSpace(' ')
@@ -1109,4 +1111,4 @@ JetFile: BinaryHeap.kt
PsiElement(MINUS)('-')
PsiWhiteSpace(' ')
INTEGER_CONSTANT
PsiElement(INTEGER_LITERAL)('1')
PsiElement(INTEGER_LITERAL)('1')
compiler/testData/psi/examples/priorityqueues/IPriorityQueue.txt
Vendored
+3 -1
View File
@@ -1,6 +1,8 @@
JetFile: IPriorityQueue.kt
PACKAGE_DIRECTIVE
<empty list>
IMPORT_LIST
<empty list>
CLASS
MODIFIER_LIST
PsiElement(open)('open')
@@ -61,4 +63,4 @@ JetFile: IPriorityQueue.kt
REFERENCE_EXPRESSION
PsiElement(IDENTIFIER)('Boolean')
PsiWhiteSpace('\n')
PsiElement(RBRACE)('}')
PsiElement(RBRACE)('}')
compiler/testData/psi/examples/priorityqueues/PriorityQueueAsPushPop.txt
Vendored
+3 -1
View File
@@ -1,6 +1,8 @@
JetFile: PriorityQueueAsPushPop.kt
PACKAGE_DIRECTIVE
<empty list>
IMPORT_LIST
<empty list>
CLASS
PsiElement(class)('class')
PsiWhiteSpace(' ')
@@ -134,4 +136,4 @@ JetFile: PriorityQueueAsPushPop.kt
REFERENCE_EXPRESSION
PsiElement(IDENTIFIER)('isEmpty')
PsiWhiteSpace('\n\n')
PsiElement(RBRACE)('}')
PsiElement(RBRACE)('}')
compiler/testData/psi/examples/util/Comparison.txt
Vendored
+3 -1
View File
@@ -1,6 +1,8 @@
JetFile: Comparison.kt
PACKAGE_DIRECTIVE
<empty list>
IMPORT_LIST
<empty list>
TYPEDEF
PsiElement(typealias)('typealias')
PsiWhiteSpace(' ')
@@ -420,4 +422,4 @@ JetFile: Comparison.kt
REFERENCE_EXPRESSION
PsiElement(IDENTIFIER)('GR')
PsiWhiteSpace('\n')
PsiElement(RBRACE)('}')
PsiElement(RBRACE)('}')
compiler/testData/psi/examples/util/IComparable.txt
Vendored
+3 -1
View File
@@ -1,6 +1,8 @@
JetFile: IComparable.kt
PACKAGE_DIRECTIVE
<empty list>
IMPORT_LIST
<empty list>
CLASS
MODIFIER_LIST
PsiElement(open)('open')
@@ -44,4 +46,4 @@ JetFile: IComparable.kt
REFERENCE_EXPRESSION
PsiElement(IDENTIFIER)('Int')
PsiWhiteSpace('\n')
PsiElement(RBRACE)('}')
PsiElement(RBRACE)('}')