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

JspxSanityTest fixed

Browse Source
This commit is contained in:
Olesya Smirnova
2005-02-03 21:34:14 +03:00
parent aca22f3f6b
commit 046a07de55
1 changed files with 21 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
source/com/intellij/psi/impl/source/codeStyle/CodeEditUtil.java
+21 -1
View File
@@ -7,6 +7,7 @@ import com.intellij.lang.Language;
import com.intellij.openapi.diagnostic.Logger;
import com.intellij.openapi.fileTypes.FileType;
import com.intellij.openapi.fileTypes.StdFileTypes;
import com.intellij.openapi.fileTypes.LanguageFileType;
import com.intellij.openapi.project.Project;
import com.intellij.openapi.util.text.StringUtil;
import com.intellij.openapi.util.TextRange;
@@ -437,7 +438,26 @@ public class CodeEditUtil {
public static Whitespace getIndentWhiteSpaceBeforeToken(final ASTNode tokenNode,
final Language language,
TextRange textRange) {
return getWhiteSpaceBeforeToken(tokenNode, language, textRange);
return getWhiteSpaceBeforeToken(tokenNode, chooseLanguage(tokenNode, language), textRange);
}
private static Language chooseLanguage(final ASTNode tokenNode, final Language language) {
if (tokenNode == null) return language;
final PsiElement secondAsPsiElement = SourceTreeToPsiMap.treeElementToPsi(tokenNode);
if (secondAsPsiElement == null) return language;
final PsiFile file = secondAsPsiElement.getContainingFile();
if (file == null) return language;
final FileType fileType = file.getFileType();
if (!(fileType instanceof LanguageFileType)) {
return language;
}
if (((LanguageFileType)fileType).getLanguage().getFormatter() == null) {
return language;
} else {
return ((LanguageFileType)fileType).getLanguage();
}
}
public static Whitespace getWhiteSpaceBeforeToken(final ASTNode tokenNode,