From 09c8414616c7ff1069f36e061774c00aab35258a Mon Sep 17 00:00:00 2001 From: Olesya Smirnova Date: Wed, 9 Feb 2005 22:37:26 +0300 Subject: [PATCH] IndentAdjuster fixed --- .../psi/impl/source/codeStyle/CodeEditUtil.java | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/source/com/intellij/psi/impl/source/codeStyle/CodeEditUtil.java b/source/com/intellij/psi/impl/source/codeStyle/CodeEditUtil.java index 16d46cf19694..3429669893c4 100644 --- a/source/com/intellij/psi/impl/source/codeStyle/CodeEditUtil.java +++ b/source/com/intellij/psi/impl/source/codeStyle/CodeEditUtil.java @@ -424,15 +424,14 @@ public class CodeEditUtil { } } else { - return getWhiteSpaceBeforeToken(second, language, false).generateNewWhiteSpace(); + return getWhiteSpaceBeforeToken(second, language).generateNewWhiteSpace(); } } public static Whitespace getIndentWhiteSpaceBeforeToken(final ASTNode tokenNode, - final Language language, - final boolean ignoreAlignment) { - return getWhiteSpaceBeforeToken(tokenNode, chooseLanguage(tokenNode, language), ignoreAlignment); + final Language language) { + return getWhiteSpaceBeforeToken(tokenNode, chooseLanguage(tokenNode, language)); } private static Language chooseLanguage(final ASTNode tokenNode, final Language language) { @@ -455,8 +454,7 @@ public class CodeEditUtil { } public static Whitespace getWhiteSpaceBeforeToken(final ASTNode tokenNode, - final Language language, - final boolean ignoreAlignment) { + final Language language) { LOG.assertTrue(tokenNode != null); final PsiElement secondAsPsiElement = SourceTreeToPsiMap.treeElementToPsi(tokenNode); LOG.assertTrue(secondAsPsiElement != null); @@ -475,7 +473,7 @@ public class CodeEditUtil { settings, file); - return GeneralCodeFormatter.getWhiteSpaceBetweenTokens(pseudoText, settings, file.getFileType(), endOffset, ignoreAlignment); + return GeneralCodeFormatter.getWhiteSpaceBetweenTokens(pseudoText, settings, file.getFileType(), endOffset); } finally { settings.XML_KEEP_LINE_BREAKS = oldValue;