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

Fix absence of implemented/overridden markers on overridden functions

Browse Source
This commit is contained in:
Nikolay Krasko
2013-05-13 16:21:19 +04:00
committed by Natalia.Ukhorskaya
parent cc96f397eb
commit 7243ef4627
3 changed files with 25 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/src/org/jetbrains/jet/plugin/highlighter/JetLineMarkerProvider.java
+5 -6
View File
@@ -34,6 +34,7 @@ import com.intellij.openapi.project.DumbService;
import com.intellij.openapi.ui.popup.JBPopup; import com.intellij.openapi.ui.popup.JBPopup;
import com.intellij.openapi.ui.popup.JBPopupFactory; import com.intellij.openapi.ui.popup.JBPopupFactory;
import com.intellij.openapi.util.Pair; import com.intellij.openapi.util.Pair;
import com.intellij.openapi.util.text.StringUtil;
import com.intellij.psi.CommonClassNames; import com.intellij.psi.CommonClassNames;
import com.intellij.psi.PsiClass; import com.intellij.psi.PsiClass;
import com.intellij.psi.PsiElement; import com.intellij.psi.PsiElement;
@@ -255,15 +256,12 @@ public class JetLineMarkerProvider implements LineMarkerProvider {
builder.append(DescriptorRenderer.HTML.render(descriptor)); builder.append(DescriptorRenderer.HTML.render(descriptor));
int overrideCount = overriddenMembers.size(); int overrideCount = overriddenMembers.size();
if (overrideCount >= 1) { if (overrideCount >= 1) {
builder.append("\n").append(implementsOrOverrides).append("\n"); builder.append("<br/>").append(implementsOrOverrides).append("<br/>");
builder.append(DescriptorRenderer.HTML.render(overriddenMembers.iterator().next())); builder.append(DescriptorRenderer.HTML.render(overriddenMembers.iterator().next()));
} }
if (overrideCount > 1) { if (overrideCount > 1) {
int count = overrideCount - 1; int otherCount = overrideCount - 1;
builder.append("\nand ").append(count).append(" other ").append(memberKind); builder.append("<br/>and ").append(otherCount).append(" other ").append(StringUtil.pluralize(memberKind, otherCount));
if (count > 1) {
builder.append("s");
}
} }
return builder.toString(); return builder.toString();
@@ -318,6 +316,7 @@ public class JetLineMarkerProvider implements LineMarkerProvider {
// Not all open or abstract declarations are actually overridable, but this is heuristic // Not all open or abstract declarations are actually overridable, but this is heuristic
return declaration.hasModifier(JetTokens.ABSTRACT_KEYWORD) || return declaration.hasModifier(JetTokens.ABSTRACT_KEYWORD) ||
declaration.hasModifier(JetTokens.OPEN_KEYWORD) || declaration.hasModifier(JetTokens.OPEN_KEYWORD) ||
declaration.hasModifier(JetTokens.OVERRIDE_KEYWORD) ||
((JetClass) parent.getParent()).isTrait(); ((JetClass) parent.getParent()).isTrait();
} }
idea/testData/codeInsight/lineMarker/OverrideFunction.kt
+16
View File
@@ -0,0 +1,16 @@
open class <lineMarker></lineMarker>A {
open fun <lineMarker></lineMarker>a(){
}
}
open class <lineMarker descr="<html><body>Is subclassed by<br>&nbsp;&nbsp;&nbsp;&nbsp;C</body></html>"></lineMarker>B:A(){
override fun <lineMarker
descr="<b>internal</b> <b>open</b> <b>fun</b> a(): jet.Unit <i>defined in</i> B<br/>overrides<br/><b>internal</b> <b>open</b> <b>fun</b> a(): jet.Unit <i>defined in</i> A"></lineMarker><lineMarker
descr="<html><body>Is overridden in <br>&nbsp;&nbsp;&nbsp;&nbsp;C</body></html>"></lineMarker>a(){
}
}
class C:B(){
override fun <lineMarker></lineMarker>a(){
}
}
idea/tests/org/jetbrains/jet/plugin/codeInsight/OverrideImplementLineMarkerTest.java
+4
View File
@@ -42,6 +42,10 @@ public class OverrideImplementLineMarkerTest extends LightCodeInsightFixtureTest
doTest(); doTest();
} }
public void testOverrideFunction() throws Throwable {
doTest();
}
private void doTest() { private void doTest() {
try { try {
myFixture.configureByFile(getTestName(false) + ".kt"); myFixture.configureByFile(getTestName(false) + ".kt");