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

Fix build - remove calling getText()

Browse Source 
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:
Nikolay Krasko
2012-10-09 15:39:23 +04:00
parent e869568196
commit d257256960
3 changed files with 5 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/kotlinSignature/AlternativeFieldSignatureData.java
-5
View File
@@ -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",
compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/kotlinSignature/AlternativeMethodSignatureData.java
-17
View File
@@ -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<PsiType, String>() {
@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) {
compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/kotlinSignature/ElementAlternativeSignatureData.java
+5 -9
View File
@@ -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<PsiErrorElement> 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);
}
}
}