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

Fixed assertion fail (EA-29575).

Browse Source
This commit is contained in:
Dmitry Trofimov
2011-12-12 17:21:53 +01:00
parent 99931bd7a3
commit 6e74d5da97
2 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/core-api/src/com/intellij/psi/util/PsiTreeUtil.java
+1 -1
View File
@@ -952,7 +952,7 @@ public class PsiTreeUtil {
throw new AssertionError(descendant + " is not a descendant of " + ancestor);
}
public static List<PsiElement> getInjectedElements(OuterLanguageElement outerLanguageElement) {
public static List<PsiElement> getInjectedElements(@NotNull OuterLanguageElement outerLanguageElement) {
PsiElement psi = outerLanguageElement.getContainingFile().getViewProvider().getPsi(outerLanguageElement.getLanguage());
TextRange injectionRange = outerLanguageElement.getTextRange();
List<PsiElement> res = Lists.newArrayList();
platform/lang-impl/src/com/intellij/codeInsight/generation/CommentByBlockCommentHandler.java
+5 -1
View File
@@ -189,7 +189,11 @@ public class CommentByBlockCommentHandler implements CodeInsightActionHandler {
return true;
}
private boolean isInjectedWhiteSpace(TextRange range, OuterLanguageElement element) {
private boolean isInjectedWhiteSpace(@NotNull TextRange range, @NotNull OuterLanguageElement element) {
PsiElement psi = element.getContainingFile().getViewProvider().getPsi(element.getLanguage());
if (psi == null) {
return false;
}
List<PsiElement> injectedElements = PsiTreeUtil.getInjectedElements(element);
for (PsiElement el : injectedElements) {
if (!isWhiteSpaceOrComment(el, range)) {