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

Migration to expect/actual: remove header/impl from completion, tests

Browse Source
This commit is contained in:
Mikhail Glukhikh
2017-09-15 10:39:23 +03:00
parent 6766196bd8
commit 27615209ed
18 changed files with 33 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/idea-completion/src/org/jetbrains/kotlin/idea/completion/KeywordCompletion.kt
+1 -1
View File
@@ -422,7 +422,7 @@ object KeywordCompletion {
private fun isModifierSupportedAtLanguageLevel(keyword: KtKeywordToken, languageVersionSettings: LanguageVersionSettings): Boolean { private fun isModifierSupportedAtLanguageLevel(keyword: KtKeywordToken, languageVersionSettings: LanguageVersionSettings): Boolean {
val feature = when (keyword) { val feature = when (keyword) {
KtTokens.TYPE_ALIAS_KEYWORD -> LanguageFeature.TypeAliases KtTokens.TYPE_ALIAS_KEYWORD -> LanguageFeature.TypeAliases
KtTokens.HEADER_KEYWORD, KtTokens.IMPL_KEYWORD, KtTokens.HEADER_KEYWORD, KtTokens.IMPL_KEYWORD -> return false
KtTokens.EXPECT_KEYWORD, KtTokens.ACTUAL_KEYWORD -> LanguageFeature.MultiPlatformProjects KtTokens.EXPECT_KEYWORD, KtTokens.ACTUAL_KEYWORD -> LanguageFeature.MultiPlatformProjects
KtTokens.SUSPEND_KEYWORD -> LanguageFeature.Coroutines KtTokens.SUSPEND_KEYWORD -> LanguageFeature.Coroutines
else -> return true else -> return true
idea/idea-completion/testData/keywords/AfterClassProperty.kt
Vendored
+2 -2
View File
@@ -42,6 +42,6 @@ class MouseMovedEventArgs
// EXIST: const // EXIST: const
// EXIST: suspend // EXIST: suspend
// EXIST: typealias // EXIST: typealias
// EXIST: header // EXIST: expect
// EXIST: impl // EXIST: actual
// NOTHING_ELSE // NOTHING_ELSE
idea/idea-completion/testData/keywords/AfterClasses.kt
Vendored
+2 -2
View File
@@ -36,6 +36,6 @@ class B {
// EXIST: const // EXIST: const
// EXIST: suspend // EXIST: suspend
// EXIST: typealias // EXIST: typealias
// EXIST: header // EXIST: expect
// EXIST: impl // EXIST: actual
// NOTHING_ELSE // NOTHING_ELSE
idea/idea-completion/testData/keywords/AfterFuns.kt
Vendored
+2 -2
View File
@@ -41,6 +41,6 @@ class A {
// EXIST: const // EXIST: const
// EXIST: suspend // EXIST: suspend
// EXIST: typealias // EXIST: typealias
// EXIST: header // EXIST: expect
// EXIST: impl // EXIST: actual
// NOTHING_ELSE // NOTHING_ELSE
idea/idea-completion/testData/keywords/BeforeClass.kt
Vendored
+1
View File
@@ -3,4 +3,5 @@ e<caret>class A {
// EXIST: enum // EXIST: enum
// EXIST: external // EXIST: external
// EXIST: expect
// NOTHING_ELSE // NOTHING_ELSE
idea/idea-completion/testData/keywords/GlobalPropertyAccessors.kt
Vendored
+2 -2
View File
@@ -40,6 +40,6 @@ var a : Int
// EXIST: const // EXIST: const
// EXIST: suspend // EXIST: suspend
// EXIST: typealias // EXIST: typealias
// EXIST: header // EXIST: expect
// EXIST: impl // EXIST: actual
// NOTHING_ELSE // NOTHING_ELSE
idea/idea-completion/testData/keywords/InAnnotationClassScope.kt
Vendored
+2 -2
View File
@@ -27,6 +27,6 @@ annotation class Test {
// EXIST: const // EXIST: const
// EXIST: suspend // EXIST: suspend
// EXIST: typealias // EXIST: typealias
// EXIST: header // EXIST: expect
// EXIST: impl // EXIST: actual
// NOTHING_ELSE // NOTHING_ELSE
idea/idea-completion/testData/keywords/InClassBeforeFun.kt
Vendored
+2 -2
View File
@@ -39,6 +39,6 @@ public class Test {
// EXIST: const // EXIST: const
// EXIST: suspend // EXIST: suspend
// EXIST: typealias // EXIST: typealias
// EXIST: header // EXIST: expect
// EXIST: impl // EXIST: actual
// NOTHING_ELSE // NOTHING_ELSE
idea/idea-completion/testData/keywords/InClassScope.kt
Vendored
+2 -2
View File
@@ -33,6 +33,6 @@ class TestClass {
// EXIST: const // EXIST: const
// EXIST: suspend // EXIST: suspend
// EXIST: typealias // EXIST: typealias
// EXIST: header // EXIST: expect
// EXIST: impl // EXIST: actual
// NOTHING_ELSE // NOTHING_ELSE
idea/idea-completion/testData/keywords/InEnumScope2.kt
Vendored
+2 -2
View File
@@ -28,8 +28,8 @@ enum class Test {
// EXIST: suspend // EXIST: suspend
// EXIST: fun // EXIST: fun
// EXIST: typealias // EXIST: typealias
// EXIST: header // EXIST: expect
// EXIST: impl // EXIST: actual
/* TODO: items below are not valid here */ /* TODO: items below are not valid here */
// EXIST: class // EXIST: class
idea/idea-completion/testData/keywords/InInterfaceScope.kt
Vendored
+2 -2
View File
@@ -29,6 +29,6 @@ interface Test {
// EXIST: const // EXIST: const
// EXIST: suspend // EXIST: suspend
// EXIST: typealias // EXIST: typealias
// EXIST: header // EXIST: expect
// EXIST: impl // EXIST: actual
// NOTHING_ELSE // NOTHING_ELSE
idea/idea-completion/testData/keywords/InObjectScope.kt
Vendored
+2 -2
View File
@@ -30,6 +30,6 @@ object Test {
// EXIST: const // EXIST: const
// EXIST: suspend // EXIST: suspend
// EXIST: typealias // EXIST: typealias
// EXIST: header // EXIST: expect
// EXIST: impl // EXIST: actual
// NOTHING_ELSE // NOTHING_ELSE
idea/idea-completion/testData/keywords/InPrimaryConstructorParametersList.kt
Vendored
+1 -1
View File
@@ -14,7 +14,7 @@ class TestSample(<caret>)
// EXIST: private // EXIST: private
// EXIST: protected // EXIST: protected
// EXIST: internal // EXIST: internal
// EXIST: impl // EXIST: actual
/* TODO: keywords below should not be here*/ /* TODO: keywords below should not be here*/
// EXIST: abstract // EXIST: abstract
// EXIST: const // EXIST: const
idea/idea-completion/testData/keywords/InTopScopeAfterPackage.kt
Vendored
+2 -2
View File
@@ -27,6 +27,6 @@ package Test
// EXIST: const // EXIST: const
// EXIST: suspend // EXIST: suspend
// EXIST: typealias // EXIST: typealias
// EXIST: header // EXIST: expect
// EXIST: impl // EXIST: actual
// NOTHING_ELSE // NOTHING_ELSE
idea/idea-completion/testData/keywords/PropertyAccessors.kt
Vendored
+2 -2
View File
@@ -41,6 +41,6 @@ class Some {
// EXIST: const // EXIST: const
// EXIST: suspend // EXIST: suspend
// EXIST: typealias // EXIST: typealias
// EXIST: header // EXIST: expect
// EXIST: impl // EXIST: actual
// NOTHING_ELSE // NOTHING_ELSE
idea/idea-completion/testData/keywords/PropertyAccessors2.kt
Vendored
+2 -2
View File
@@ -41,6 +41,6 @@ class Some {
// EXIST: const // EXIST: const
// EXIST: suspend // EXIST: suspend
// EXIST: typealias // EXIST: typealias
// EXIST: header // EXIST: expect
// EXIST: impl // EXIST: actual
// NOTHING_ELSE // NOTHING_ELSE
idea/idea-completion/testData/keywords/PropertySetter.kt
Vendored
+2 -2
View File
@@ -39,6 +39,6 @@ class Some {
// EXIST: const // EXIST: const
// EXIST: suspend // EXIST: suspend
// EXIST: typealias // EXIST: typealias
// EXIST: header // EXIST: expect
// EXIST: impl // EXIST: actual
// NOTHING_ELSE // NOTHING_ELSE
idea/idea-completion/testData/keywords/TopScope.kt
Vendored
+2 -2
View File
@@ -26,6 +26,6 @@
// EXIST: const // EXIST: const
// EXIST: suspend // EXIST: suspend
// EXIST: typealias // EXIST: typealias
// EXIST: header // EXIST: expect
// EXIST: impl // EXIST: actual
// NOTHING_ELSE // NOTHING_ELSE