Fix build - remove calling getText()
Call of getText() on class element activated caching for com.intellij.filetype.decompiler extension point in KeyedExtensionCollector. This cache wasn't invalidated on set up JavaWithoutSources tests.
This commit is contained in:
-5
@@ -63,11 +63,6 @@ public class AlternativeFieldSignatureData extends ElementAlternativeSignatureDa
|
|||||||
return altReturnType;
|
return altReturnType;
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
|
||||||
public String getSignature() {
|
|
||||||
return field.getPsiField().getText();
|
|
||||||
}
|
|
||||||
|
|
||||||
private static void checkFieldAnnotation(JetProperty altProperty, PsiFieldWrapper fieldWrapper, boolean isVar) {
|
private static void checkFieldAnnotation(JetProperty altProperty, PsiFieldWrapper fieldWrapper, boolean isVar) {
|
||||||
if (!ComparatorUtil.equalsNullable(fieldWrapper.getName(), altProperty.getName())) {
|
if (!ComparatorUtil.equalsNullable(fieldWrapper.getName(), altProperty.getName())) {
|
||||||
throw new AlternativeSignatureMismatchException("Field name mismatch, original: %s, alternative: %s",
|
throw new AlternativeSignatureMismatchException("Field name mismatch, original: %s, alternative: %s",
|
||||||
|
|||||||
-17
@@ -17,11 +17,7 @@
|
|||||||
package org.jetbrains.jet.lang.resolve.java.kotlinSignature;
|
package org.jetbrains.jet.lang.resolve.java.kotlinSignature;
|
||||||
|
|
||||||
import com.intellij.openapi.project.Project;
|
import com.intellij.openapi.project.Project;
|
||||||
import com.intellij.openapi.util.text.StringUtil;
|
|
||||||
import com.intellij.psi.PsiNamedElement;
|
import com.intellij.psi.PsiNamedElement;
|
||||||
import com.intellij.psi.PsiSubstitutor;
|
|
||||||
import com.intellij.psi.PsiType;
|
|
||||||
import com.intellij.util.Function;
|
|
||||||
import com.intellij.util.containers.ComparatorUtil;
|
import com.intellij.util.containers.ComparatorUtil;
|
||||||
import org.jetbrains.annotations.NotNull;
|
import org.jetbrains.annotations.NotNull;
|
||||||
import org.jetbrains.annotations.Nullable;
|
import org.jetbrains.annotations.Nullable;
|
||||||
@@ -233,19 +229,6 @@ public class AlternativeMethodSignatureData extends ElementAlternativeSignatureD
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
|
||||||
public String getSignature() {
|
|
||||||
String paramsString = StringUtil.join(method.getPsiMethod().getSignature(PsiSubstitutor.EMPTY).getParameterTypes(),
|
|
||||||
new Function<PsiType, String>() {
|
|
||||||
@Override
|
|
||||||
public String fun(PsiType psiType) {
|
|
||||||
return psiType.getPresentableText();
|
|
||||||
}
|
|
||||||
}, ", ");
|
|
||||||
|
|
||||||
return String.format("%s(%s)", altFunDeclaration.getName(), paramsString);
|
|
||||||
}
|
|
||||||
|
|
||||||
@Nullable
|
@Nullable
|
||||||
private static JetTypeConstraint findTypeParameterConstraint(@NotNull JetFunction function, @NotNull Name typeParameterName, int index) {
|
private static JetTypeConstraint findTypeParameterConstraint(@NotNull JetFunction function, @NotNull Name typeParameterName, int index) {
|
||||||
if (index != 0) {
|
if (index != 0) {
|
||||||
|
|||||||
+5
-9
@@ -66,24 +66,20 @@ public abstract class ElementAlternativeSignatureData {
|
|||||||
this.isAnnotated = isAnnotated;
|
this.isAnnotated = isAnnotated;
|
||||||
}
|
}
|
||||||
|
|
||||||
public abstract String getSignature();
|
protected static void checkForSyntaxErrors(PsiElement namedElement) {
|
||||||
|
|
||||||
protected void checkForSyntaxErrors(PsiElement namedElement) {
|
|
||||||
List<PsiErrorElement> syntaxErrors = AnalyzingUtils.getSyntaxErrorRanges(namedElement);
|
List<PsiErrorElement> syntaxErrors = AnalyzingUtils.getSyntaxErrorRanges(namedElement);
|
||||||
|
|
||||||
if (!syntaxErrors.isEmpty()) {
|
if (!syntaxErrors.isEmpty()) {
|
||||||
String textSignature = getSignature();
|
|
||||||
|
|
||||||
int errorOffset = syntaxErrors.get(0).getTextOffset();
|
int errorOffset = syntaxErrors.get(0).getTextOffset();
|
||||||
String syntaxErrorDescription = syntaxErrors.get(0).getErrorDescription();
|
String syntaxErrorDescription = syntaxErrors.get(0).getErrorDescription();
|
||||||
|
|
||||||
if (syntaxErrors.size() == 1) {
|
if (syntaxErrors.size() == 1) {
|
||||||
throw new AlternativeSignatureMismatchException("Alternative signature for %s has syntax error at %d: %s",
|
throw new AlternativeSignatureMismatchException("Alternative signature has syntax error at %d: %s",
|
||||||
textSignature, errorOffset, syntaxErrorDescription);
|
errorOffset, syntaxErrorDescription);
|
||||||
}
|
}
|
||||||
else {
|
else {
|
||||||
throw new AlternativeSignatureMismatchException("Alternative signature for %s has %d syntax errors, first is at %d: %s",
|
throw new AlternativeSignatureMismatchException("Alternative signature has %d syntax errors, first is at %d: %s",
|
||||||
textSignature, syntaxErrors.size(), errorOffset, syntaxErrorDescription);
|
syntaxErrors.size(), errorOffset, syntaxErrorDescription);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user