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

Keyword completion: add 'val' after 'const' #KT-27916 Fixed

Browse Source
This commit is contained in:
Toshiaki Kameyama
2018-11-02 13:15:57 +09:00
committed by Alexander Podkhalyuzin
parent 1b715ab253
commit 35cc6ff495
19 changed files with 20 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/idea-completion/src/org/jetbrains/kotlin/idea/completion/KeywordCompletion.kt
+2 -1
View File
@@ -58,7 +58,8 @@ object KeywordCompletion {
ENUM_KEYWORD to CLASS_KEYWORD, ENUM_KEYWORD to CLASS_KEYWORD,
ANNOTATION_KEYWORD to CLASS_KEYWORD, ANNOTATION_KEYWORD to CLASS_KEYWORD,
SEALED_KEYWORD to CLASS_KEYWORD, SEALED_KEYWORD to CLASS_KEYWORD,
LATEINIT_KEYWORD to VAR_KEYWORD LATEINIT_KEYWORD to VAR_KEYWORD,
CONST_KEYWORD to VAL_KEYWORD
) )
private val KEYWORD_CONSTRUCTS = mapOf<KtKeywordToken, String>( private val KEYWORD_CONSTRUCTS = mapOf<KtKeywordToken, String>(
idea/idea-completion/testData/keywords/AfterClassProperty.kt
Vendored
+1 -1
View File
@@ -39,7 +39,7 @@ class MouseMovedEventArgs
// EXIST: tailrec // EXIST: tailrec
// EXIST: external // EXIST: external
// EXIST: annotation class // EXIST: annotation class
// EXIST: const // EXIST: const val
// EXIST: suspend // EXIST: suspend
// EXIST: typealias // EXIST: typealias
// EXIST: expect // EXIST: expect
idea/idea-completion/testData/keywords/AfterClasses.kt
Vendored
+1 -1
View File
@@ -33,7 +33,7 @@ class B {
// EXIST: tailrec // EXIST: tailrec
// EXIST: external // EXIST: external
// EXIST: annotation class // EXIST: annotation class
// EXIST: const // EXIST: const val
// EXIST: suspend // EXIST: suspend
// EXIST: typealias // EXIST: typealias
// EXIST: expect // EXIST: expect
idea/idea-completion/testData/keywords/AfterClasses_LangLevel10.kt
Vendored
+1 -1
View File
@@ -33,5 +33,5 @@ class B {
// EXIST: tailrec // EXIST: tailrec
// EXIST: external // EXIST: external
// EXIST: annotation class // EXIST: annotation class
// EXIST: const // EXIST: const val
// NOTHING_ELSE // NOTHING_ELSE
idea/idea-completion/testData/keywords/AfterClasses_LangLevel11.kt
Vendored
+1 -1
View File
@@ -33,7 +33,7 @@ class B {
// EXIST: tailrec // EXIST: tailrec
// EXIST: external // EXIST: external
// EXIST: annotation class // EXIST: annotation class
// EXIST: const // EXIST: const val
// EXIST: suspend // EXIST: suspend
// EXIST: typealias // EXIST: typealias
// NOTHING_ELSE // NOTHING_ELSE
idea/idea-completion/testData/keywords/AfterFuns.kt
Vendored
+1 -1
View File
@@ -38,7 +38,7 @@ class A {
// EXIST: tailrec // EXIST: tailrec
// EXIST: external // EXIST: external
// EXIST: annotation class // EXIST: annotation class
// EXIST: const // EXIST: const val
// EXIST: suspend // EXIST: suspend
// EXIST: typealias // EXIST: typealias
// EXIST: expect // EXIST: expect
idea/idea-completion/testData/keywords/GlobalPropertyAccessors.kt
Vendored
+1 -1
View File
@@ -37,7 +37,7 @@ var a : Int
// EXIST: tailrec // EXIST: tailrec
// EXIST: external // EXIST: external
// EXIST: annotation class // EXIST: annotation class
// EXIST: const // EXIST: const val
// EXIST: suspend // EXIST: suspend
// EXIST: typealias // EXIST: typealias
// EXIST: expect // EXIST: expect
idea/idea-completion/testData/keywords/InAnnotationClassScope.kt
Vendored
+1 -1
View File
@@ -24,7 +24,7 @@ annotation class Test {
// EXIST: tailrec // EXIST: tailrec
// EXIST: external // EXIST: external
// EXIST: annotation class // EXIST: annotation class
// EXIST: const // EXIST: const val
// EXIST: suspend // EXIST: suspend
// EXIST: typealias // EXIST: typealias
// EXIST: expect // EXIST: expect
idea/idea-completion/testData/keywords/InClassBeforeFun.kt
Vendored
+1 -1
View File
@@ -36,7 +36,7 @@ public class Test {
// EXIST: tailrec // EXIST: tailrec
// EXIST: external // EXIST: external
// EXIST: annotation class // EXIST: annotation class
// EXIST: const // EXIST: const val
// EXIST: suspend // EXIST: suspend
// EXIST: typealias // EXIST: typealias
// EXIST: expect // EXIST: expect
idea/idea-completion/testData/keywords/InClassScope.kt
Vendored
+1 -1
View File
@@ -30,7 +30,7 @@ class TestClass {
// EXIST: tailrec // EXIST: tailrec
// EXIST: external // EXIST: external
// EXIST: annotation class // EXIST: annotation class
// EXIST: const // EXIST: const val
// EXIST: suspend // EXIST: suspend
// EXIST: typealias // EXIST: typealias
// EXIST: expect // EXIST: expect
idea/idea-completion/testData/keywords/InEnumScope2.kt
Vendored
+1 -1
View File
@@ -24,7 +24,7 @@ enum class Test {
// EXIST: tailrec // EXIST: tailrec
// EXIST: external // EXIST: external
// EXIST: annotation class // EXIST: annotation class
// EXIST: const // EXIST: const val
// EXIST: suspend // EXIST: suspend
// EXIST: fun // EXIST: fun
// EXIST: typealias // EXIST: typealias
idea/idea-completion/testData/keywords/InInterfaceScope.kt
Vendored
+1 -1
View File
@@ -26,7 +26,7 @@ interface Test {
// EXIST: tailrec // EXIST: tailrec
// EXIST: external // EXIST: external
// EXIST: annotation class // EXIST: annotation class
// EXIST: const // EXIST: const val
// EXIST: suspend // EXIST: suspend
// EXIST: typealias // EXIST: typealias
// EXIST: expect // EXIST: expect
idea/idea-completion/testData/keywords/InObjectScope.kt
Vendored
+1 -1
View File
@@ -27,7 +27,7 @@ object Test {
// EXIST: tailrec // EXIST: tailrec
// EXIST: external // EXIST: external
// EXIST: annotation class // EXIST: annotation class
// EXIST: const // EXIST: const val
// EXIST: suspend // EXIST: suspend
// EXIST: typealias // EXIST: typealias
// EXIST: expect // EXIST: expect
idea/idea-completion/testData/keywords/InPrimaryConstructorParametersList.kt
Vendored
+1 -1
View File
@@ -17,6 +17,6 @@ class TestSample(<caret>)
// EXIST: actual // EXIST: actual
/* TODO: keywords below should not be here*/ /* TODO: keywords below should not be here*/
// EXIST: abstract // EXIST: abstract
// EXIST: const // EXIST: const val
// EXIST: lateinit var // EXIST: lateinit var
// NOTHING_ELSE // NOTHING_ELSE
idea/idea-completion/testData/keywords/InTopScopeAfterPackage.kt
Vendored
+1 -1
View File
@@ -24,7 +24,7 @@ package Test
// EXIST: tailrec // EXIST: tailrec
// EXIST: external // EXIST: external
// EXIST: annotation class // EXIST: annotation class
// EXIST: const // EXIST: const val
// EXIST: suspend // EXIST: suspend
// EXIST: typealias // EXIST: typealias
// EXIST: expect // EXIST: expect
idea/idea-completion/testData/keywords/PropertyAccessors.kt
Vendored
+1 -1
View File
@@ -38,7 +38,7 @@ class Some {
// EXIST: tailrec // EXIST: tailrec
// EXIST: external // EXIST: external
// EXIST: annotation class // EXIST: annotation class
// EXIST: const // EXIST: const val
// EXIST: suspend // EXIST: suspend
// EXIST: typealias // EXIST: typealias
// EXIST: expect // EXIST: expect
idea/idea-completion/testData/keywords/PropertyAccessors2.kt
Vendored
+1 -1
View File
@@ -38,7 +38,7 @@ class Some {
// EXIST: tailrec // EXIST: tailrec
// EXIST: external // EXIST: external
// EXIST: annotation class // EXIST: annotation class
// EXIST: const // EXIST: const val
// EXIST: suspend // EXIST: suspend
// EXIST: typealias // EXIST: typealias
// EXIST: expect // EXIST: expect
idea/idea-completion/testData/keywords/PropertySetter.kt
Vendored
+1 -1
View File
@@ -36,7 +36,7 @@ class Some {
// EXIST: tailrec // EXIST: tailrec
// EXIST: external // EXIST: external
// EXIST: annotation class // EXIST: annotation class
// EXIST: const // EXIST: const val
// EXIST: suspend // EXIST: suspend
// EXIST: typealias // EXIST: typealias
// EXIST: expect // EXIST: expect
idea/idea-completion/testData/keywords/TopScope.kt
Vendored
+1 -1
View File
@@ -23,7 +23,7 @@
// EXIST: tailrec // EXIST: tailrec
// EXIST: external // EXIST: external
// EXIST: annotation class // EXIST: annotation class
// EXIST: const // EXIST: const val
// EXIST: suspend // EXIST: suspend
// EXIST: typealias // EXIST: typealias
// EXIST: expect // EXIST: expect