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

PseudoTextIndentAdjuster fixed

Browse Source
This commit is contained in:
Olesya Smirnova
2005-02-07 13:38:04 +03:00
parent 72fb9095a6
commit c54d4d46e0
1 changed files with 8 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
source/com/intellij/psi/impl/source/codeStyle/CodeEditUtil.java
+8 -7
View File
@@ -6,11 +6,10 @@ import com.intellij.lang.ASTNode;
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.fileTypes.StdFileTypes;
import com.intellij.openapi.project.Project;
import com.intellij.openapi.util.text.StringUtil;
import com.intellij.openapi.util.TextRange;
import com.intellij.psi.*;
import com.intellij.psi.codeStyle.CodeStyleSettings;
import com.intellij.psi.codeStyle.CodeStyleSettingsManager;
@@ -425,14 +424,15 @@ public class CodeEditUtil {
}
}
else {
return getWhiteSpaceBeforeToken(second, language).generateNewWhiteSpace();
return getWhiteSpaceBeforeToken(second, language, false).generateNewWhiteSpace();
}
}
public static Whitespace getIndentWhiteSpaceBeforeToken(final ASTNode tokenNode,
final Language language) {
return getWhiteSpaceBeforeToken(tokenNode, chooseLanguage(tokenNode, language));
final Language language,
final boolean ignoreAlignment) {
return getWhiteSpaceBeforeToken(tokenNode, chooseLanguage(tokenNode, language), ignoreAlignment);
}
private static Language chooseLanguage(final ASTNode tokenNode, final Language language) {
@@ -455,7 +455,8 @@ public class CodeEditUtil {
}
public static Whitespace getWhiteSpaceBeforeToken(final ASTNode tokenNode,
final Language language) {
final Language language,
final boolean ignoreAlignment) {
LOG.assertTrue(tokenNode != null);
final PsiElement secondAsPsiElement = SourceTreeToPsiMap.treeElementToPsi(tokenNode);
LOG.assertTrue(secondAsPsiElement != null);
@@ -474,7 +475,7 @@ public class CodeEditUtil {
settings,
file);
return GeneralCodeFormatter.getWhiteSpaceBetweenTokens(pseudoText, settings, file.getFileType(), endOffset);
return GeneralCodeFormatter.getWhiteSpaceBetweenTokens(pseudoText, settings, file.getFileType(), endOffset, ignoreAlignment);
}
finally {
settings.XML_KEEP_LINE_BREAKS = oldValue;