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

Convert KotlinCompilerManager into a startup activity

Browse Source 
Relates to #KT-38407
This commit is contained in:
Vladimir Dolzhenko
2020-04-20 17:38:09 +02:00
committed by Vladimir Dolzhenko
parent 4f99ac406a
commit 346cc40f44
6 changed files with 122 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/idea-jvm/src/org/jetbrains/kotlin/idea/compiler/KotlinCompilerManager.kt
+17 -28
View File
@@ -1,43 +1,30 @@
/*
* Copyright 2010-2015 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.
* Copyright 2010-2020 JetBrains s.r.o. and Kotlin Programming Language contributors.
* Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
*/
package org.jetbrains.kotlin.idea.compiler
import com.intellij.diagnostic.PluginException
import com.intellij.ide.plugins.PluginManagerCore
import com.intellij.openapi.application.ApplicationManager
import com.intellij.openapi.compiler.CompilationStatusListener
import com.intellij.openapi.compiler.CompileContext
import com.intellij.openapi.compiler.CompilerManager
import com.intellij.openapi.compiler.CompilerMessageCategory
import com.intellij.openapi.components.ProjectComponent
import com.intellij.openapi.compiler.*
import com.intellij.openapi.diagnostic.Logger
import com.intellij.openapi.project.Project
import com.intellij.openapi.startup.StartupActivity
import com.intellij.openapi.util.io.FileUtilRt
import com.intellij.openapi.vfs.LocalFileSystem
import com.intellij.util.containers.ContainerUtil
import org.jetbrains.kotlin.config.CompilerRunnerConstants
import org.jetbrains.kotlin.idea.KotlinFileType
import org.jetbrains.kotlin.idea.util.application.isUnitTestMode
import org.jetbrains.kotlin.js.JavaScript
import java.io.PrintStream
import java.io.PrintWriter
class KotlinCompilerManager(project: Project, manager: CompilerManager) : ProjectComponent {
// BUNCH: 192
class KotlinCompilerStartupActivity : StartupActivity {
// Extending PluginException ensures that Exception Analyzer recognizes this as a Kotlin exception
private class KotlinCompilerException(private val text: String) :
PluginException("", PluginManagerCore.getPluginByClassName(KotlinCompilerManager::class.java.name)) {
PluginException("", PluginManagerCore.getPluginByClassName(KotlinCompilerStartupActivity::class.java.name)) {
override fun printStackTrace(s: PrintWriter) {
s.print(text)
}
@@ -63,17 +50,18 @@ class KotlinCompilerManager(project: Project, manager: CompilerManager) : Projec
}
companion object {
private val LOG = Logger.getInstance(KotlinCompilerManager::class.java)
private val LOG = Logger.getInstance(KotlinCompilerStartupActivity::class.java)
// Comes from external make
private const val PREFIX_WITH_COMPILER_NAME =
CompilerRunnerConstants.KOTLIN_COMPILER_NAME + ": " + CompilerRunnerConstants.INTERNAL_ERROR_PREFIX
private val FILE_EXTS_WHICH_NEEDS_REFRESH = ContainerUtil.immutableSet(JavaScript.DOT_EXTENSION, ".map")
private val FILE_EXTS_WHICH_NEEDS_REFRESH = setOf(JavaScript.DOT_EXTENSION, ".map")
}
init {
override fun runActivity(project: Project) {
val manager = CompilerManager.getInstance(project)
manager.addCompilableFileType(KotlinFileType.INSTANCE)
manager.addCompilationStatusListener(object : CompilationStatusListener {
project.messageBus.connect().subscribe(CompilerTopics.COMPILATION_STATUS, object : CompilationStatusListener {
override fun compilationFinished(aborted: Boolean, errors: Int, warnings: Int, compileContext: CompileContext) {
for (error in compileContext.getMessages(CompilerMessageCategory.ERROR)) {
val message = error.message
@@ -84,7 +72,8 @@ class KotlinCompilerManager(project: Project, manager: CompilerManager) : Projec
}
override fun fileGenerated(outputRoot: String, relativePath: String) {
if (ApplicationManager.getApplication().isUnitTestMode) return
if (isUnitTestMode()) return
val ext = FileUtilRt.getExtension(relativePath).toLowerCase()
if (FILE_EXTS_WHICH_NEEDS_REFRESH.contains(ext)) {
val outFile = "$outputRoot/$relativePath"
@@ -93,6 +82,6 @@ class KotlinCompilerManager(project: Project, manager: CompilerManager) : Projec
virtualFile.refresh( /*async =*/false, /*recursive =*/false)
}
}
}, project)
})
}
}
idea/idea-jvm/src/org/jetbrains/kotlin/idea/compiler/KotlinCompilerManager.kt.192
+99
View File
@@ -0,0 +1,99 @@
/*
* Copyright 2010-2015 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.idea.compiler
import com.intellij.diagnostic.PluginException
import com.intellij.ide.plugins.PluginManagerCore
import com.intellij.openapi.application.ApplicationManager
import com.intellij.openapi.compiler.CompilationStatusListener
import com.intellij.openapi.compiler.CompileContext
import com.intellij.openapi.compiler.CompilerManager
import com.intellij.openapi.compiler.CompilerMessageCategory
import com.intellij.openapi.components.ProjectComponent
import com.intellij.openapi.diagnostic.Logger
import com.intellij.openapi.project.Project
import com.intellij.openapi.util.io.FileUtilRt
import com.intellij.openapi.vfs.LocalFileSystem
import com.intellij.util.containers.ContainerUtil
import org.jetbrains.kotlin.config.CompilerRunnerConstants
import org.jetbrains.kotlin.idea.KotlinFileType
import org.jetbrains.kotlin.js.JavaScript
import java.io.PrintStream
import java.io.PrintWriter
// BUNCH: 192
class KotlinCompilerManager(project: Project, manager: CompilerManager) : ProjectComponent {
// Extending PluginException ensures that Exception Analyzer recognizes this as a Kotlin exception
private class KotlinCompilerException(private val text: String) :
PluginException("", PluginManagerCore.getPluginByClassName(KotlinCompilerManager::class.java.name)) {
override fun printStackTrace(s: PrintWriter) {
s.print(text)
}
override fun printStackTrace(s: PrintStream) {
s.print(text)
}
@Synchronized
override fun fillInStackTrace(): Throwable {
return this
}
override fun getStackTrace(): Array<StackTraceElement> {
LOG.error("Somebody called getStackTrace() on KotlinCompilerException")
// Return some stack trace that originates in Kotlin
return UnsupportedOperationException().stackTrace
}
override val message: String
get() = "<Exception from standalone Kotlin compiler>"
}
companion object {
private val LOG = Logger.getInstance(KotlinCompilerManager::class.java)
// Comes from external make
private const val PREFIX_WITH_COMPILER_NAME =
CompilerRunnerConstants.KOTLIN_COMPILER_NAME + ": " + CompilerRunnerConstants.INTERNAL_ERROR_PREFIX
private val FILE_EXTS_WHICH_NEEDS_REFRESH = ContainerUtil.immutableSet(JavaScript.DOT_EXTENSION, ".map")
}
init {
manager.addCompilableFileType(KotlinFileType.INSTANCE)
manager.addCompilationStatusListener(object : CompilationStatusListener {
override fun compilationFinished(aborted: Boolean, errors: Int, warnings: Int, compileContext: CompileContext) {
for (error in compileContext.getMessages(CompilerMessageCategory.ERROR)) {
val message = error.message
if (message.startsWith(CompilerRunnerConstants.INTERNAL_ERROR_PREFIX) || message.startsWith(PREFIX_WITH_COMPILER_NAME)) {
LOG.error(KotlinCompilerException(message))
}
}
}
override fun fileGenerated(outputRoot: String, relativePath: String) {
if (ApplicationManager.getApplication().isUnitTestMode) return
val ext = FileUtilRt.getExtension(relativePath).toLowerCase()
if (FILE_EXTS_WHICH_NEEDS_REFRESH.contains(ext)) {
val outFile = "$outputRoot/$relativePath"
val virtualFile = LocalFileSystem.getInstance().findFileByPath(outFile)
?: error("Virtual file not found for generated file path: $outFile")
virtualFile.refresh( /*async =*/false, /*recursive =*/false)
}
}
}, project)
}
}
idea/resources/META-INF/jvm-common.xml
-3
View File
@@ -1,8 +1,5 @@
<idea-plugin>
<project-components>
<component>
<implementation-class>org.jetbrains.kotlin.idea.compiler.KotlinCompilerManager</implementation-class>
</component>
<component>
<implementation-class>org.jetbrains.kotlin.idea.scratch.ScratchFileModuleInfoProvider</implementation-class>
</component>
idea/resources/META-INF/jvm.xml
+1
View File
@@ -3,6 +3,7 @@
<extensions defaultExtensionNs="com.intellij">
<postStartupActivity implementation="org.jetbrains.kotlin.idea.configuration.ui.KotlinConfigurationCheckerStartupActivity"/>
<postStartupActivity implementation="org.jetbrains.kotlin.idea.JvmPluginStartupActivity"/>
<postStartupActivity implementation="org.jetbrains.kotlin.idea.compiler.KotlinCompilerStartupActivity"/>
<projectService serviceImplementation="org.jetbrains.kotlin.idea.configuration.ui.KotlinConfigurationCheckerService"/>
</extensions>
idea/resources/META-INF/jvm.xml.192
+4
View File
@@ -6,6 +6,10 @@
</application-components>
<project-components>
<component>
<implementation-class>org.jetbrains.kotlin.idea.compiler.KotlinCompilerManager</implementation-class>
</component>
<component>
<implementation-class>org.jetbrains.kotlin.idea.configuration.ui.KotlinConfigurationCheckerComponent</implementation-class>
</component>
idea/resources/META-INF/jvm.xml.201
+1
View File
@@ -7,6 +7,7 @@
<extensions defaultExtensionNs="com.intellij">
<postStartupActivity implementation="org.jetbrains.kotlin.idea.configuration.ui.KotlinConfigurationCheckerStartupActivity"/>
<postStartupActivity implementation="org.jetbrains.kotlin.idea.JvmPluginStartupActivity"/>
<postStartupActivity implementation="org.jetbrains.kotlin.idea.compiler.KotlinCompilerStartupActivity"/>
<projectService serviceImplementation="org.jetbrains.kotlin.idea.configuration.ui.KotlinConfigurationCheckerService"/>
</extensions>