diff --git a/.idea/dictionaries/Nikolay_Krasko.xml b/.idea/dictionaries/Nikolay_Krasko.xml
index fb8bbdedea8..97c56608a7b 100644
--- a/.idea/dictionaries/Nikolay_Krasko.xml
+++ b/.idea/dictionaries/Nikolay_Krasko.xml
@@ -7,9 +7,9 @@
fqname
goto
gradle
+ infos
intrinsics
kdoc
- kompiler
memoize
memoized
multiline
diff --git a/compiler/testData/diagnostics/tests/inference/kt1293.kt b/compiler/testData/diagnostics/tests/inference/kt1293.kt
index c00fb5860c8..023ab7228f0 100644
--- a/compiler/testData/diagnostics/tests/inference/kt1293.kt
+++ b/compiler/testData/diagnostics/tests/inference/kt1293.kt
@@ -1,5 +1,5 @@
// !WITH_NEW_INFERENCE
-//KT-1293 Kompiler doesn't show error when element of Array is assigned to Int
+//KT-1293 Compiler doesn't show error when element of Array is assigned to Int
package kt1293
diff --git a/jps-plugin/src/org/jetbrains/kotlin/compilerRunner/CompilerRunnerUtil.kt b/jps-plugin/src/org/jetbrains/kotlin/compilerRunner/CompilerRunnerUtil.kt
index 66ace28275e..6c736122f53 100644
--- a/jps-plugin/src/org/jetbrains/kotlin/compilerRunner/CompilerRunnerUtil.kt
+++ b/jps-plugin/src/org/jetbrains/kotlin/compilerRunner/CompilerRunnerUtil.kt
@@ -90,14 +90,14 @@ object CompilerRunnerUtil {
environment: JpsCompilerEnvironment,
out: PrintStream
): Any? = withCompilerClassloader(environment) { classLoader ->
- val kompiler = Class.forName(compilerClassName, true, classLoader)
- val exec = kompiler.getMethod(
+ val compiler = Class.forName(compilerClassName, true, classLoader)
+ val exec = compiler.getMethod(
"execAndOutputXml",
PrintStream::class.java,
Class.forName("org.jetbrains.kotlin.config.Services", true, classLoader),
Array::class.java
)
- exec.invoke(kompiler.newInstance(), out, environment.services, arguments)
+ exec.invoke(compiler.newInstance(), out, environment.services, arguments)
}
fun invokeClassesFqNames(