From d257256960437726a528e46190a15ff7b069db8f Mon Sep 17 00:00:00 2001 From: Nikolay Krasko Date: Tue, 9 Oct 2012 15:39:23 +0400 Subject: [PATCH] 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. --- .../AlternativeFieldSignatureData.java | 5 ----- .../AlternativeMethodSignatureData.java | 17 ----------------- .../ElementAlternativeSignatureData.java | 14 +++++--------- 3 files changed, 5 insertions(+), 31 deletions(-) diff --git a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/kotlinSignature/AlternativeFieldSignatureData.java b/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/kotlinSignature/AlternativeFieldSignatureData.java index 7099422fff0..89fadc8952e 100644 --- a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/kotlinSignature/AlternativeFieldSignatureData.java +++ b/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/kotlinSignature/AlternativeFieldSignatureData.java @@ -63,11 +63,6 @@ public class AlternativeFieldSignatureData extends ElementAlternativeSignatureDa return altReturnType; } - @Override - public String getSignature() { - return field.getPsiField().getText(); - } - private static void checkFieldAnnotation(JetProperty altProperty, PsiFieldWrapper fieldWrapper, boolean isVar) { if (!ComparatorUtil.equalsNullable(fieldWrapper.getName(), altProperty.getName())) { throw new AlternativeSignatureMismatchException("Field name mismatch, original: %s, alternative: %s", diff --git a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/kotlinSignature/AlternativeMethodSignatureData.java b/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/kotlinSignature/AlternativeMethodSignatureData.java index 676aca2a82c..fc0f73a255a 100644 --- a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/kotlinSignature/AlternativeMethodSignatureData.java +++ b/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/kotlinSignature/AlternativeMethodSignatureData.java @@ -17,11 +17,7 @@ package org.jetbrains.jet.lang.resolve.java.kotlinSignature; import com.intellij.openapi.project.Project; -import com.intellij.openapi.util.text.StringUtil; 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 org.jetbrains.annotations.NotNull; 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() { - @Override - public String fun(PsiType psiType) { - return psiType.getPresentableText(); - } - }, ", "); - - return String.format("%s(%s)", altFunDeclaration.getName(), paramsString); - } - @Nullable private static JetTypeConstraint findTypeParameterConstraint(@NotNull JetFunction function, @NotNull Name typeParameterName, int index) { if (index != 0) { diff --git a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/kotlinSignature/ElementAlternativeSignatureData.java b/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/kotlinSignature/ElementAlternativeSignatureData.java index af975546ac2..bf64e3719b7 100644 --- a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/kotlinSignature/ElementAlternativeSignatureData.java +++ b/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/kotlinSignature/ElementAlternativeSignatureData.java @@ -66,24 +66,20 @@ public abstract class ElementAlternativeSignatureData { this.isAnnotated = isAnnotated; } - public abstract String getSignature(); - - protected void checkForSyntaxErrors(PsiElement namedElement) { + protected static void checkForSyntaxErrors(PsiElement namedElement) { List syntaxErrors = AnalyzingUtils.getSyntaxErrorRanges(namedElement); if (!syntaxErrors.isEmpty()) { - String textSignature = getSignature(); - int errorOffset = syntaxErrors.get(0).getTextOffset(); String syntaxErrorDescription = syntaxErrors.get(0).getErrorDescription(); if (syntaxErrors.size() == 1) { - throw new AlternativeSignatureMismatchException("Alternative signature for %s has syntax error at %d: %s", - textSignature, errorOffset, syntaxErrorDescription); + throw new AlternativeSignatureMismatchException("Alternative signature has syntax error at %d: %s", + errorOffset, syntaxErrorDescription); } else { - throw new AlternativeSignatureMismatchException("Alternative signature for %s has %d syntax errors, first is at %d: %s", - textSignature, syntaxErrors.size(), errorOffset, syntaxErrorDescription); + throw new AlternativeSignatureMismatchException("Alternative signature has %d syntax errors, first is at %d: %s", + syntaxErrors.size(), errorOffset, syntaxErrorDescription); } } }