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

Filter synthetic trait overrides for "overriding" markers too

Browse Source
This commit is contained in:
Nikolay Krasko
2014-08-14 14:29:34 +04:00
committed by Nikolay Krasko
parent 897ebd0347
commit 236cdc7d82
5 changed files with 42 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
+7 -5
View File
@@ -477,12 +477,14 @@ public class JetLineMarkerProvider implements LineMarkerProvider {
public boolean process(Pair<PsiMethod, PsiMethod> pair) { public boolean process(Pair<PsiMethod, PsiMethod> pair) {
ProgressManager.checkCanceled(); ProgressManager.checkCanceled();
PsiMethod superMethod = pair.getFirst(); if (!(pair.getSecond() instanceof KotlinLightMethodFromTrait)) {
PsiMethod superMethod = pair.getFirst();
T declaration = mappingToJava.get(superMethod); T declaration = mappingToJava.get(superMethod);
if (declaration != null) { if (declaration != null) {
mappingToJava.remove(superMethod); mappingToJava.remove(superMethod);
overridden.add(declaration); overridden.add(declaration);
}
} }
return !mappingToJava.isEmpty(); return !mappingToJava.isEmpty();
idea/testData/codeInsight/lineMarker/NoOverridingMarkerOnDefaultTraitImpl.kt
+9
View File
@@ -0,0 +1,9 @@
trait <lineMarker descr="*"></lineMarker>SkipSupport {
fun <lineMarker descr="<html><body>Is implemented in <br>&nbsp;&nbsp;&nbsp;&nbsp;SkipSupportWithDefaults</body></html>"></lineMarker>skip()
}
public trait <lineMarker descr="*"></lineMarker>SkipSupportWithDefaults : SkipSupport {
override fun <lineMarker descr="Implements function in 'SkipSupport'"></lineMarker>skip() {}
}
open class SkipSupportImpl : SkipSupportWithDefaults
idea/testData/codeInsight/lineMarker/OverridingTooltipOnDefaultTraitImpl.kt
+13
View File
@@ -0,0 +1,13 @@
trait <lineMarker descr="*"></lineMarker>SkipSupport {
fun <lineMarker descr="<html><body>Is implemented in <br>&nbsp;&nbsp;&nbsp;&nbsp;SkipSupportImpl1<br>&nbsp;&nbsp;&nbsp;&nbsp;SkipSupportWithDefaults</body></html>"></lineMarker>skip()
}
public trait <lineMarker descr="*"></lineMarker>SkipSupportWithDefaults : SkipSupport {
override fun <lineMarker descr="<html><body>Is implemented in <br>&nbsp;&nbsp;&nbsp;&nbsp;SkipSupportImpl1</body></html>"><lineMarker descr="Implements function in 'SkipSupport'"></lineMarker></lineMarker>skip() {}
}
public trait SkipSupportImpl1 : SkipSupportWithDefaults {
override fun <lineMarker descr="Overrides function in 'SkipSupportWithDefaults'"></lineMarker>skip() {}
}
open class SkipSupportImpl : SkipSupportWithDefaults
idea/tests/org/jetbrains/jet/plugin/codeInsight/AbstractLineMarkersTest.java
+1 -1
View File
@@ -75,7 +75,7 @@ public abstract class AbstractLineMarkersTest extends JetLightCodeInsightFixture
} }
catch (AssertionError error) { catch (AssertionError error) {
try { try {
String actualTextWithTestData = HighlightTestDataUtil.insertInfoTags(markers, false, myFixture.getFile().getText()); String actualTextWithTestData = HighlightTestDataUtil.insertInfoTags(markers, true, myFixture.getFile().getText());
JetTestUtils.assertEqualsToFile(new File(getTestDataPath(), fileName()), actualTextWithTestData); JetTestUtils.assertEqualsToFile(new File(getTestDataPath(), fileName()), actualTextWithTestData);
} }
catch (FileComparisonFailure failure) { catch (FileComparisonFailure failure) {
idea/tests/org/jetbrains/jet/plugin/codeInsight/LineMarkersTestGenerated.java
+12
View File
@@ -104,6 +104,12 @@ public class LineMarkersTestGenerated extends AbstractLineMarkersTest {
doTest(fileName); doTest(fileName);
} }
@TestMetadata("NoOverridingMarkerOnDefaultTraitImpl.kt")
public void testNoOverridingMarkerOnDefaultTraitImpl() throws Exception {
String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/lineMarker/NoOverridingMarkerOnDefaultTraitImpl.kt");
doTest(fileName);
}
@TestMetadata("Overloads.kt") @TestMetadata("Overloads.kt")
public void testOverloads() throws Exception { public void testOverloads() throws Exception {
String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/lineMarker/Overloads.kt"); String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/lineMarker/Overloads.kt");
@@ -122,6 +128,12 @@ public class LineMarkersTestGenerated extends AbstractLineMarkersTest {
doTest(fileName); doTest(fileName);
} }
@TestMetadata("OverridingTooltipOnDefaultTraitImpl.kt")
public void testOverridingTooltipOnDefaultTraitImpl() throws Exception {
String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/lineMarker/OverridingTooltipOnDefaultTraitImpl.kt");
doTest(fileName);
}
@TestMetadata("PropertyOverride.kt") @TestMetadata("PropertyOverride.kt")
public void testPropertyOverride() throws Exception { public void testPropertyOverride() throws Exception {
String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/lineMarker/PropertyOverride.kt"); String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/lineMarker/PropertyOverride.kt");