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

Highlighting ranges should never include comments before/after element

Browse Source
This commit is contained in:
Valentin Kipyatkov
2014-10-31 14:24:13 +03:00
parent f0b93f3de3
commit 0806de6782
8 changed files with 33 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/frontend/src/org/jetbrains/jet/lang/diagnostics/PositioningStrategy.java
+31 -3
View File
@@ -18,8 +18,10 @@ package org.jetbrains.jet.lang.diagnostics;
import com.intellij.lang.ASTNode;
import com.intellij.openapi.util.TextRange;
import com.intellij.psi.PsiComment;
import com.intellij.psi.PsiElement;
import com.intellij.psi.PsiErrorElement;
import com.intellij.psi.PsiWhiteSpace;
import org.jetbrains.annotations.NotNull;
import java.util.Collections;
@@ -42,12 +44,12 @@ public class PositioningStrategy<E extends PsiElement> {
@NotNull
protected static List<TextRange> markElement(@NotNull PsiElement element) {
return Collections.singletonList(element.getTextRange());
return Collections.singletonList(new TextRange(getStartOffset(element), getEndOffset(element)));
}
@NotNull
protected static List<TextRange> markNode(@NotNull ASTNode node) {
return Collections.singletonList(node.getTextRange());
return markElement(node.getPsi());
}
@NotNull
@@ -57,7 +59,33 @@ public class PositioningStrategy<E extends PsiElement> {
@NotNull
protected static List<TextRange> markRange(@NotNull PsiElement from, @NotNull PsiElement to) {
return markRange(new TextRange(from.getTextRange().getStartOffset(), to.getTextRange().getEndOffset()));
return markRange(new TextRange(getStartOffset(from), getEndOffset(to)));
}
private static int getStartOffset(@NotNull PsiElement element) {
PsiElement child = element.getFirstChild();
if (child != null) {
while (child instanceof PsiComment || child instanceof PsiWhiteSpace) {
child = child.getNextSibling();
}
if (child != null) {
return getStartOffset(child);
}
}
return element.getTextRange().getStartOffset();
}
private static int getEndOffset(@NotNull PsiElement element) {
PsiElement child = element.getLastChild();
if (child != null) {
while (child instanceof PsiComment || child instanceof PsiWhiteSpace) {
child = child.getPrevSibling();
}
if (child != null) {
return getEndOffset(child);
}
}
return element.getTextRange().getEndOffset();
}
protected static boolean hasSyntaxErrors(@NotNull PsiElement psiElement) {
compiler/testData/codegen/box/functions/tailRecursion/recursiveCallInLambda.kt
-1
View File
@@ -1,5 +1,4 @@
// !DIAGNOSTICS: -UNUSED_PARAMETER
<!NO_TAIL_CALLS_FOUND!>tailRecursive fun foo()<!> {
bar {
<!NON_TAIL_RECURSIVE_CALL!>foo<!>()
compiler/testData/diagnostics/tests/Abstract.kt
-3
View File
@@ -1,7 +1,6 @@
// FILE: b.kt
package MyPackage
//properties
<!MUST_BE_INITIALIZED!>val a: Int<!>
val a1: Int = 1
<!MUST_BE_INITIALIZED!><!ILLEGAL_MODIFIER!>abstract<!> val a2: Int<!>
@@ -23,14 +22,12 @@ package MyPackage
<!ILLEGAL_MODIFIER!>abstract<!> val e3: Int = <!PROPERTY_INITIALIZER_NO_BACKING_FIELD!>0<!>; get() = a
//methods
<!NON_MEMBER_FUNCTION_NO_BODY!>fun f()<!>
fun g() {}
<!ILLEGAL_MODIFIER!>abstract<!> fun h()
<!ILLEGAL_MODIFIER!>abstract<!> fun j() {}
//property accessors
var i: Int <!ILLEGAL_MODIFIER!>abstract<!> get <!ILLEGAL_MODIFIER!>abstract<!> set
var i1: Int = <!PROPERTY_INITIALIZER_NO_BACKING_FIELD!>0<!>; <!ILLEGAL_MODIFIER!>abstract<!> get <!ILLEGAL_MODIFIER!>abstract<!> set
compiler/testData/diagnostics/tests/AbstractInAbstractClass.kt
-3
View File
@@ -2,7 +2,6 @@ package abstract
abstract class MyAbstractClass() {
//properties
<!MUST_BE_INITIALIZED_OR_BE_ABSTRACT!>val a: Int<!>
val a1: Int = 1
abstract val a2: Int
@@ -24,14 +23,12 @@ abstract class MyAbstractClass() {
abstract val e3: Int = <!ABSTRACT_PROPERTY_WITH_INITIALIZER!>0<!>; <!ABSTRACT_PROPERTY_WITH_GETTER!>get() = a<!>
//methods
<!NON_ABSTRACT_FUNCTION_WITH_NO_BODY!>fun f()<!>
fun g() {}
abstract fun h()
<!ABSTRACT_FUNCTION_WITH_BODY!>abstract<!> fun j() {}
//property accessors
var i: Int <!ILLEGAL_MODIFIER!>abstract<!> get <!ILLEGAL_MODIFIER!>abstract<!> set
var i1: Int = <!PROPERTY_INITIALIZER_NO_BACKING_FIELD!>0<!>; <!ILLEGAL_MODIFIER!>abstract<!> get <!ILLEGAL_MODIFIER!>abstract<!> set
compiler/testData/diagnostics/tests/AbstractInClass.kt
-3
View File
@@ -2,7 +2,6 @@ package abstract
class MyClass() {
//properties
<!MUST_BE_INITIALIZED_OR_BE_ABSTRACT!>val a: Int<!>
val a1: Int = 1
<!ABSTRACT_PROPERTY_IN_NON_ABSTRACT_CLASS!>abstract<!> val a2: Int
@@ -24,14 +23,12 @@ class MyClass() {
<!ABSTRACT_PROPERTY_IN_NON_ABSTRACT_CLASS!>abstract<!> val e3: Int = 0; get() = a
//methods
<!NON_ABSTRACT_FUNCTION_WITH_NO_BODY!>fun f()<!>
fun g() {}
<!ABSTRACT_FUNCTION_IN_NON_ABSTRACT_CLASS!>abstract<!> fun h()
<!ABSTRACT_FUNCTION_IN_NON_ABSTRACT_CLASS, ABSTRACT_FUNCTION_WITH_BODY!>abstract<!> fun j() {}
//property accessors
var i: Int <!ILLEGAL_MODIFIER!>abstract<!> get <!ILLEGAL_MODIFIER!>abstract<!> set
var i1: Int = <!PROPERTY_INITIALIZER_NO_BACKING_FIELD!>0<!>; <!ILLEGAL_MODIFIER!>abstract<!> get <!ILLEGAL_MODIFIER!>abstract<!> set
compiler/testData/diagnostics/tests/duplicateJvmSignature/accidentalOverrides/phantomClashWithSamAdapter.kt
+2 -2
View File
@@ -23,6 +23,6 @@ import p.*
open class K0 : Foo()
class K : K0() {
<!VIRTUAL_MEMBER_HIDDEN!>// We keep this test to make sure ACCIDENTAL_OVERRIDE is not reported
fun <!CANNOT_WEAKEN_ACCESS_PRIVILEGE!>foo<!>(f: () -> Unit)<!> {}
// We keep this test to make sure ACCIDENTAL_OVERRIDE is not reported
<!VIRTUAL_MEMBER_HIDDEN!>fun <!CANNOT_WEAKEN_ACCESS_PRIVILEGE!>foo<!>(f: () -> Unit)<!> {}
}
compiler/testData/diagnostics/tests/duplicateJvmSignature/functionAndProperty/topLevelDifferentFiles.kt
-2
View File
@@ -1,7 +1,5 @@
// FILE: a.kt
<!CONFLICTING_JVM_DECLARATIONS!>val x<!> = 1
// FILE: b.kt
<!CONFLICTING_JVM_DECLARATIONS!>fun getX()<!> = 1
compiler/testData/diagnostics/tests/enum/AbstractInEnum.kt
-3
View File
@@ -3,7 +3,6 @@ package abstract
enum class MyEnum() {
//properties
<!MUST_BE_INITIALIZED_OR_BE_ABSTRACT!>val a: Int<!>
val a1: Int = 1
abstract val a2: Int
@@ -25,14 +24,12 @@ enum class MyEnum() {
abstract val e3: Int = <!ABSTRACT_PROPERTY_WITH_INITIALIZER!>0<!>; <!ABSTRACT_PROPERTY_WITH_GETTER!>get() = a<!>
//methods
<!NON_ABSTRACT_FUNCTION_WITH_NO_BODY!>fun f()<!>
fun g() {}
abstract fun h()
<!ABSTRACT_FUNCTION_WITH_BODY!>abstract<!> fun j() {}
//property accessors
var i: Int <!ILLEGAL_MODIFIER!>abstract<!> get <!ILLEGAL_MODIFIER!>abstract<!> set
var i1: Int = <!PROPERTY_INITIALIZER_NO_BACKING_FIELD!>0<!>; <!ILLEGAL_MODIFIER!>abstract<!> get <!ILLEGAL_MODIFIER!>abstract<!> set