MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-27 10:03:11 +07:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
Anna Kozlova
2014-10-31 21:04:16 +01:00
parent ebddd40bcb 9dcfe69c29
commit fb0fb31b3d
2 changed files with 10 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/structuralsearch-java/src/com/intellij/structuralsearch/impl/matcher/JavaMatchingVisitor.java
+9 -2
View File
@@ -835,7 +835,14 @@ public class JavaMatchingVisitor extends JavaElementVisitor {
}
}
final String text = stripTypeParameters(el.getText());
final boolean equalsIgnorePackage = MatchUtils.compareWithNoDifferenceToPackage(text, stripTypeParameters(el2.getText()));
String text2;
if (el2 instanceof PsiClass) {
text2 = ((PsiClass)el2).getQualifiedName();
} else {
text2 = el2.getText();
}
final boolean equalsIgnorePackage = MatchUtils.compareWithNoDifferenceToPackage(text, stripTypeParameters(text2));
if (equalsIgnorePackage || !(el2 instanceof PsiJavaReference)) {
return equalsIgnorePackage;
}
@@ -846,7 +853,7 @@ public class JavaMatchingVisitor extends JavaElementVisitor {
return text.equals(((PsiClass)element2).getQualifiedName());
}
else {
return MatchUtils.compareWithNoDifferenceToPackage(text, el2.getText());
return MatchUtils.compareWithNoDifferenceToPackage(text, text2);
}
}
}
platform/platform-impl/src/com/intellij/idea/IdeaLogger.java
+1 -1
View File
@@ -121,7 +121,7 @@ public class IdeaLogger extends Logger {
@Override
public void error(String message, @Nullable Throwable t, @NotNull String... details) {
if (t instanceof ProcessCanceledException) {
myLogger.error(new Throwable("Do not log ProcessCanceledException").initCause(t));
myLogger.error(message, new Throwable("Do not log ProcessCanceledException").initCause(t));
throw (ProcessCanceledException)t;
}