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

Move Jsr305State to util.runtime

Browse Source
This commit is contained in:
e5l
2017-08-07 16:46:30 +03:00
parent 5fd8f93b0e
commit 746de612ad
8 changed files with 45 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/cli/cli-common/src/org/jetbrains/kotlin/cli/common/arguments/K2JVMCompilerArguments.kt
+1 -1
View File
@@ -17,8 +17,8 @@
package org.jetbrains.kotlin.cli.common.arguments
import org.jetbrains.kotlin.config.AnalysisFlag
import org.jetbrains.kotlin.config.Jsr305State
import org.jetbrains.kotlin.config.JvmTarget
import org.jetbrains.kotlin.utils.Jsr305State
class K2JVMCompilerArguments : CommonCompilerArguments() {
companion object {
compiler/tests/org/jetbrains/kotlin/checkers/AbstractForeignAnnotationsTest.kt
+1
View File
@@ -18,6 +18,7 @@ package org.jetbrains.kotlin.checkers
import org.jetbrains.kotlin.config.*
import org.jetbrains.kotlin.test.MockLibraryUtil
import org.jetbrains.kotlin.utils.Jsr305State
import java.io.File
val FOREIGN_ANNOTATIONS_SOURCES_PATH = "compiler/testData/foreignAnnotations/annotations"
compiler/tests/org/jetbrains/kotlin/jvm/compiler/LoadJavaPackageAnnotationsTest.kt
+1
View File
@@ -31,6 +31,7 @@ import org.jetbrains.kotlin.test.KotlinTestUtils
import org.jetbrains.kotlin.test.MockLibraryUtil
import org.jetbrains.kotlin.test.TestJdkKind
import org.jetbrains.kotlin.test.testFramework.KtUsefulTestCase
import org.jetbrains.kotlin.utils.Jsr305State
import java.io.File
class LoadJavaPackageAnnotationsTest : KtUsefulTestCase() {
compiler/tests/org/jetbrains/kotlin/jvm/compiler/TypeQualifierAnnotationResolverTest.kt
+1
View File
@@ -37,6 +37,7 @@ import org.jetbrains.kotlin.test.KotlinTestUtils
import org.jetbrains.kotlin.test.MockLibraryUtil
import org.jetbrains.kotlin.test.TestJdkKind
import org.jetbrains.kotlin.test.testFramework.KtUsefulTestCase
import org.jetbrains.kotlin.utils.Jsr305State
import java.io.File
class TypeQualifierAnnotationResolverTest : KtUsefulTestCase() {
compiler/util/src/org/jetbrains/kotlin/config/AnalysisFlag.kt
+1 -18
View File
@@ -16,6 +16,7 @@
package org.jetbrains.kotlin.config
import org.jetbrains.kotlin.utils.Jsr305State
import kotlin.properties.ReadOnlyProperty
import kotlin.reflect.KProperty
@@ -54,21 +55,3 @@ class AnalysisFlag<out T> internal constructor(
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 }
}
}
core/util.runtime/src/org/jetbrains/kotlin/utils/Jsr305State.kt
+38
View File
@@ -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
}
idea/idea-analysis/src/org/jetbrains/kotlin/idea/compiler/IDELanguageSettingsProvider.kt
+1
View File
@@ -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.languageVersionSettings
import org.jetbrains.kotlin.idea.project.targetPlatform
import org.jetbrains.kotlin.utils.Jsr305State
object IDELanguageSettingsProvider : LanguageSettingsProvider {
override fun getLanguageVersionSettings(moduleInfo: ModuleInfo, project: Project): LanguageVersionSettings =
idea/tests/org/jetbrains/kotlin/idea/highlighter/Jsr305HighlightingTest.kt
+1 -1
View File
@@ -21,7 +21,6 @@ import com.intellij.openapi.roots.ModifiableRootModel
import com.intellij.testFramework.LightProjectDescriptor
import org.jetbrains.kotlin.cli.common.arguments.K2JVMCompilerArguments
import org.jetbrains.kotlin.codegen.forTestCompile.ForTestCompileRuntime
import org.jetbrains.kotlin.config.Jsr305State
import org.jetbrains.kotlin.config.JvmTarget
import org.jetbrains.kotlin.config.KotlinFacetSettingsProvider
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.KotlinLightCodeInsightFixtureTestCase
import org.jetbrains.kotlin.test.MockLibraryUtil
import org.jetbrains.kotlin.utils.Jsr305State
class Jsr305HighlightingTest : KotlinLightCodeInsightFixtureTestCase() {
override fun getProjectDescriptor(): LightProjectDescriptor {