diff --git a/idea/src/META-INF/plugin.xml b/idea/src/META-INF/plugin.xml
index 865c45a602f..b573a15f644 100644
--- a/idea/src/META-INF/plugin.xml
+++ b/idea/src/META-INF/plugin.xml
@@ -6,7 +6,7 @@
   <version>@snapshot@</version>
   <vendor url="http://www.jetbrains.com">JetBrains Inc.</vendor>
 
-  <idea-version since-build="138.515" until-build="138.9999"/>
+  <idea-version since-build="138.977" until-build="138.9999"/>
 
   <depends optional="true" config-file="junit.xml">JUnit</depends>
   <depends optional="true" config-file="gradle.xml">org.jetbrains.plugins.gradle</depends>
diff --git a/idea/src/org/jetbrains/jet/plugin/completion/weigher/JetCompletionSorting.kt b/idea/src/org/jetbrains/jet/plugin/completion/weigher/JetCompletionSorting.kt
index a9c91999fab..3e4622fe8e9 100644
--- a/idea/src/org/jetbrains/jet/plugin/completion/weigher/JetCompletionSorting.kt
+++ b/idea/src/org/jetbrains/jet/plugin/completion/weigher/JetCompletionSorting.kt
@@ -22,8 +22,9 @@ import com.intellij.codeInsight.completion.CompletionSorter
 import org.jetbrains.jet.lang.psi.JetFile
 import com.intellij.codeInsight.lookup.LookupElementWeigher
 import com.intellij.codeInsight.lookup.LookupElement
+import com.intellij.codeInsight.lookup.WeighingContext
 
-public fun CompletionResultSet.addJetSorting(parameters : CompletionParameters) : CompletionResultSet {
+public fun CompletionResultSet.addJetSorting(parameters: CompletionParameters): CompletionResultSet {
     var sorter = CompletionSorter.defaultSorter(parameters, getPrefixMatcher())!!
 
     sorter = sorter.weighBefore("stats", JetKindWeigher())
@@ -33,14 +34,14 @@ public fun CompletionResultSet.addJetSorting(parameters : CompletionParameters)
             JetDeclarationRemotenessWeigher(parameters.getOriginalFile() as JetFile),
             JetAccessibleWeigher())
 
-    sorter = sorter.weighBefore("middleMatching", PreferMatchingItemWeigher(parameters))
+    sorter = sorter.weighBefore("middleMatching", PreferMatchingItemWeigher())
 
     return withRelevanceSorter(sorter)
 }
 
-class PreferMatchingItemWeigher(private val parameters: CompletionParameters) : LookupElementWeigher("preferMatching", false, true){
-    override fun weigh(element: LookupElement): Comparable<Int>? {
-        val prefix = parameters.getLookup().itemPattern(element)
+class PreferMatchingItemWeigher : LookupElementWeigher("preferMatching", false, true) {
+    override fun weigh(element: LookupElement, context: WeighingContext): Comparable<Int> {
+        val prefix = context.itemPattern(element)
         return if (element.getLookupString() == prefix) 0 else 1
     }
-}
\ No newline at end of file
+}
diff --git a/idea/src/org/jetbrains/jet/plugin/highlighter/ErrorDuringFileAnalyzeNotificationProvider.kt b/idea/src/org/jetbrains/jet/plugin/highlighter/ErrorDuringFileAnalyzeNotificationProvider.kt
index e30c84f475f..957a1ce07ef 100644
--- a/idea/src/org/jetbrains/jet/plugin/highlighter/ErrorDuringFileAnalyzeNotificationProvider.kt
+++ b/idea/src/org/jetbrains/jet/plugin/highlighter/ErrorDuringFileAnalyzeNotificationProvider.kt
@@ -54,7 +54,7 @@ public class ErrorDuringFileAnalyzeNotificationProvider(val project: Project) :
 
     override fun getKey() = ERROR_HIGHLIGHT_PANEL_KEY
 
-    override fun createNotificationPanel(file: VirtualFile, fileEditor: FileEditor?): EditorNotificationPanel? {
+    override fun createNotificationPanel(file: VirtualFile, fileEditor: FileEditor): EditorNotificationPanel? {
         if (file.getFileType() != JetFileType.INSTANCE) {
             return null
         }