Move Jsr305State to util.runtime
This commit is contained in:
+1
-1
@@ -17,8 +17,8 @@
|
|||||||
package org.jetbrains.kotlin.cli.common.arguments
|
package org.jetbrains.kotlin.cli.common.arguments
|
||||||
|
|
||||||
import org.jetbrains.kotlin.config.AnalysisFlag
|
import org.jetbrains.kotlin.config.AnalysisFlag
|
||||||
import org.jetbrains.kotlin.config.Jsr305State
|
|
||||||
import org.jetbrains.kotlin.config.JvmTarget
|
import org.jetbrains.kotlin.config.JvmTarget
|
||||||
|
import org.jetbrains.kotlin.utils.Jsr305State
|
||||||
|
|
||||||
class K2JVMCompilerArguments : CommonCompilerArguments() {
|
class K2JVMCompilerArguments : CommonCompilerArguments() {
|
||||||
companion object {
|
companion object {
|
||||||
|
|||||||
@@ -18,6 +18,7 @@ package org.jetbrains.kotlin.checkers
|
|||||||
|
|
||||||
import org.jetbrains.kotlin.config.*
|
import org.jetbrains.kotlin.config.*
|
||||||
import org.jetbrains.kotlin.test.MockLibraryUtil
|
import org.jetbrains.kotlin.test.MockLibraryUtil
|
||||||
|
import org.jetbrains.kotlin.utils.Jsr305State
|
||||||
import java.io.File
|
import java.io.File
|
||||||
|
|
||||||
val FOREIGN_ANNOTATIONS_SOURCES_PATH = "compiler/testData/foreignAnnotations/annotations"
|
val FOREIGN_ANNOTATIONS_SOURCES_PATH = "compiler/testData/foreignAnnotations/annotations"
|
||||||
|
|||||||
@@ -31,6 +31,7 @@ import org.jetbrains.kotlin.test.KotlinTestUtils
|
|||||||
import org.jetbrains.kotlin.test.MockLibraryUtil
|
import org.jetbrains.kotlin.test.MockLibraryUtil
|
||||||
import org.jetbrains.kotlin.test.TestJdkKind
|
import org.jetbrains.kotlin.test.TestJdkKind
|
||||||
import org.jetbrains.kotlin.test.testFramework.KtUsefulTestCase
|
import org.jetbrains.kotlin.test.testFramework.KtUsefulTestCase
|
||||||
|
import org.jetbrains.kotlin.utils.Jsr305State
|
||||||
import java.io.File
|
import java.io.File
|
||||||
|
|
||||||
class LoadJavaPackageAnnotationsTest : KtUsefulTestCase() {
|
class LoadJavaPackageAnnotationsTest : KtUsefulTestCase() {
|
||||||
|
|||||||
+1
@@ -37,6 +37,7 @@ import org.jetbrains.kotlin.test.KotlinTestUtils
|
|||||||
import org.jetbrains.kotlin.test.MockLibraryUtil
|
import org.jetbrains.kotlin.test.MockLibraryUtil
|
||||||
import org.jetbrains.kotlin.test.TestJdkKind
|
import org.jetbrains.kotlin.test.TestJdkKind
|
||||||
import org.jetbrains.kotlin.test.testFramework.KtUsefulTestCase
|
import org.jetbrains.kotlin.test.testFramework.KtUsefulTestCase
|
||||||
|
import org.jetbrains.kotlin.utils.Jsr305State
|
||||||
import java.io.File
|
import java.io.File
|
||||||
|
|
||||||
class TypeQualifierAnnotationResolverTest : KtUsefulTestCase() {
|
class TypeQualifierAnnotationResolverTest : KtUsefulTestCase() {
|
||||||
|
|||||||
@@ -16,6 +16,7 @@
|
|||||||
|
|
||||||
package org.jetbrains.kotlin.config
|
package org.jetbrains.kotlin.config
|
||||||
|
|
||||||
|
import org.jetbrains.kotlin.utils.Jsr305State
|
||||||
import kotlin.properties.ReadOnlyProperty
|
import kotlin.properties.ReadOnlyProperty
|
||||||
import kotlin.reflect.KProperty
|
import kotlin.reflect.KProperty
|
||||||
|
|
||||||
@@ -54,21 +55,3 @@ class AnalysisFlag<out T> internal constructor(
|
|||||||
val loadJsr305Annotations by Flag.Jsr305StateIgnoreByDefault
|
val loadJsr305Annotations by Flag.Jsr305StateIgnoreByDefault
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
enum class Jsr305State(
|
|
||||||
val description: String,
|
|
||||||
val shouldReportWarning: Boolean = false,
|
|
||||||
val shouldReportError: Boolean = false
|
|
||||||
) {
|
|
||||||
IGNORE("ignore"),
|
|
||||||
WARN("warn", shouldReportWarning = true),
|
|
||||||
ENABLE("enable", shouldReportError = true),
|
|
||||||
;
|
|
||||||
|
|
||||||
companion object {
|
|
||||||
@JvmField
|
|
||||||
val DEFAULT: Jsr305State = IGNORE
|
|
||||||
|
|
||||||
fun findByDescription(description: String?) = values().firstOrNull { it.description == description }
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|||||||
@@ -0,0 +1,38 @@
|
|||||||
|
/*
|
||||||
|
* Copyright 2010-2017 JetBrains s.r.o.
|
||||||
|
*
|
||||||
|
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||||
|
* you may not use this file except in compliance with the License.
|
||||||
|
* You may obtain a copy of the License at
|
||||||
|
*
|
||||||
|
* http://www.apache.org/licenses/LICENSE-2.0
|
||||||
|
*
|
||||||
|
* Unless required by applicable law or agreed to in writing, software
|
||||||
|
* distributed under the License is distributed on an "AS IS" BASIS,
|
||||||
|
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||||
|
* See the License for the specific language governing permissions and
|
||||||
|
* limitations under the License.
|
||||||
|
*/
|
||||||
|
|
||||||
|
package org.jetbrains.kotlin.utils
|
||||||
|
|
||||||
|
enum class Jsr305State(
|
||||||
|
val description: String,
|
||||||
|
val shouldReportWarning: Boolean = false,
|
||||||
|
val shouldReportError: Boolean = false
|
||||||
|
) {
|
||||||
|
IGNORE("ignore"),
|
||||||
|
WARN("warn", shouldReportWarning = true),
|
||||||
|
ENABLE("enable", shouldReportError = true),
|
||||||
|
;
|
||||||
|
|
||||||
|
companion object {
|
||||||
|
@JvmField
|
||||||
|
val DEFAULT: Jsr305State = IGNORE
|
||||||
|
|
||||||
|
fun findByDescription(description: String?) = values().firstOrNull { it.description == description }
|
||||||
|
}
|
||||||
|
|
||||||
|
fun isIgnored(): Boolean = this == IGNORE
|
||||||
|
fun isWarning(): Boolean = this == WARN
|
||||||
|
}
|
||||||
+1
@@ -27,6 +27,7 @@ import org.jetbrains.kotlin.idea.caches.resolve.ModuleSourceInfo
|
|||||||
import org.jetbrains.kotlin.idea.project.getLanguageVersionSettings
|
import org.jetbrains.kotlin.idea.project.getLanguageVersionSettings
|
||||||
import org.jetbrains.kotlin.idea.project.languageVersionSettings
|
import org.jetbrains.kotlin.idea.project.languageVersionSettings
|
||||||
import org.jetbrains.kotlin.idea.project.targetPlatform
|
import org.jetbrains.kotlin.idea.project.targetPlatform
|
||||||
|
import org.jetbrains.kotlin.utils.Jsr305State
|
||||||
|
|
||||||
object IDELanguageSettingsProvider : LanguageSettingsProvider {
|
object IDELanguageSettingsProvider : LanguageSettingsProvider {
|
||||||
override fun getLanguageVersionSettings(moduleInfo: ModuleInfo, project: Project): LanguageVersionSettings =
|
override fun getLanguageVersionSettings(moduleInfo: ModuleInfo, project: Project): LanguageVersionSettings =
|
||||||
|
|||||||
@@ -21,7 +21,6 @@ import com.intellij.openapi.roots.ModifiableRootModel
|
|||||||
import com.intellij.testFramework.LightProjectDescriptor
|
import com.intellij.testFramework.LightProjectDescriptor
|
||||||
import org.jetbrains.kotlin.cli.common.arguments.K2JVMCompilerArguments
|
import org.jetbrains.kotlin.cli.common.arguments.K2JVMCompilerArguments
|
||||||
import org.jetbrains.kotlin.codegen.forTestCompile.ForTestCompileRuntime
|
import org.jetbrains.kotlin.codegen.forTestCompile.ForTestCompileRuntime
|
||||||
import org.jetbrains.kotlin.config.Jsr305State
|
|
||||||
import org.jetbrains.kotlin.config.JvmTarget
|
import org.jetbrains.kotlin.config.JvmTarget
|
||||||
import org.jetbrains.kotlin.config.KotlinFacetSettingsProvider
|
import org.jetbrains.kotlin.config.KotlinFacetSettingsProvider
|
||||||
import org.jetbrains.kotlin.config.TargetPlatformKind
|
import org.jetbrains.kotlin.config.TargetPlatformKind
|
||||||
@@ -29,6 +28,7 @@ import org.jetbrains.kotlin.idea.stubs.createFacet
|
|||||||
import org.jetbrains.kotlin.idea.test.KotlinJdkAndLibraryProjectDescriptor
|
import org.jetbrains.kotlin.idea.test.KotlinJdkAndLibraryProjectDescriptor
|
||||||
import org.jetbrains.kotlin.idea.test.KotlinLightCodeInsightFixtureTestCase
|
import org.jetbrains.kotlin.idea.test.KotlinLightCodeInsightFixtureTestCase
|
||||||
import org.jetbrains.kotlin.test.MockLibraryUtil
|
import org.jetbrains.kotlin.test.MockLibraryUtil
|
||||||
|
import org.jetbrains.kotlin.utils.Jsr305State
|
||||||
|
|
||||||
class Jsr305HighlightingTest : KotlinLightCodeInsightFixtureTestCase() {
|
class Jsr305HighlightingTest : KotlinLightCodeInsightFixtureTestCase() {
|
||||||
override fun getProjectDescriptor(): LightProjectDescriptor {
|
override fun getProjectDescriptor(): LightProjectDescriptor {
|
||||||
|
|||||||
Reference in New Issue
Block a user