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

Update plugin API to IDEA 138.977+

Browse Source
This commit is contained in:
Alexander Udalov
2014-07-08 22:50:30 +04:00
committed by Svetlana Isakova
parent bc9a8679c3
commit f3dc9733ec
3 changed files with 9 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/src/META-INF/plugin.xml
+1 -1
View File
@@ -6,7 +6,7 @@
<version>@snapshot@</version> <version>@snapshot@</version>
<vendor url="http://www.jetbrains.com">JetBrains Inc.</vendor> <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="junit.xml">JUnit</depends>
<depends optional="true" config-file="gradle.xml">org.jetbrains.plugins.gradle</depends> <depends optional="true" config-file="gradle.xml">org.jetbrains.plugins.gradle</depends>
idea/src/org/jetbrains/jet/plugin/completion/weigher/JetCompletionSorting.kt
+7 -6
View File
@@ -22,8 +22,9 @@ import com.intellij.codeInsight.completion.CompletionSorter
import org.jetbrains.jet.lang.psi.JetFile import org.jetbrains.jet.lang.psi.JetFile
import com.intellij.codeInsight.lookup.LookupElementWeigher import com.intellij.codeInsight.lookup.LookupElementWeigher
import com.intellij.codeInsight.lookup.LookupElement 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())!! var sorter = CompletionSorter.defaultSorter(parameters, getPrefixMatcher())!!
sorter = sorter.weighBefore("stats", JetKindWeigher()) sorter = sorter.weighBefore("stats", JetKindWeigher())
@@ -33,14 +34,14 @@ public fun CompletionResultSet.addJetSorting(parameters : CompletionParameters)
JetDeclarationRemotenessWeigher(parameters.getOriginalFile() as JetFile), JetDeclarationRemotenessWeigher(parameters.getOriginalFile() as JetFile),
JetAccessibleWeigher()) JetAccessibleWeigher())
sorter = sorter.weighBefore("middleMatching", PreferMatchingItemWeigher(parameters)) sorter = sorter.weighBefore("middleMatching", PreferMatchingItemWeigher())
return withRelevanceSorter(sorter) return withRelevanceSorter(sorter)
} }
class PreferMatchingItemWeigher(private val parameters: CompletionParameters) : LookupElementWeigher("preferMatching", false, true){ class PreferMatchingItemWeigher : LookupElementWeigher("preferMatching", false, true) {
override fun weigh(element: LookupElement): Comparable<Int>? { override fun weigh(element: LookupElement, context: WeighingContext): Comparable<Int> {
val prefix = parameters.getLookup().itemPattern(element) val prefix = context.itemPattern(element)
return if (element.getLookupString() == prefix) 0 else 1 return if (element.getLookupString() == prefix) 0 else 1
} }
} }
idea/src/org/jetbrains/jet/plugin/highlighter/ErrorDuringFileAnalyzeNotificationProvider.kt
+1 -1
View File
@@ -54,7 +54,7 @@ public class ErrorDuringFileAnalyzeNotificationProvider(val project: Project) :
override fun getKey() = ERROR_HIGHLIGHT_PANEL_KEY 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) { if (file.getFileType() != JetFileType.INSTANCE) {
return null return null
} }