From 27b22aaf70998e57a6b3e1d92743cb99564ccb45 Mon Sep 17 00:00:00 2001 From: Olesya Smirnova Date: Mon, 7 Feb 2005 00:28:56 +0300 Subject: [PATCH] EnterActionTest fixed --- .../psi/impl/source/codeStyle/CodeEditUtil.java | 15 ++++----------- 1 file changed, 4 insertions(+), 11 deletions(-) diff --git a/source/com/intellij/psi/impl/source/codeStyle/CodeEditUtil.java b/source/com/intellij/psi/impl/source/codeStyle/CodeEditUtil.java index 5fce5ea2fb18..a6ed86cd9c8b 100644 --- a/source/com/intellij/psi/impl/source/codeStyle/CodeEditUtil.java +++ b/source/com/intellij/psi/impl/source/codeStyle/CodeEditUtil.java @@ -430,15 +430,9 @@ public class CodeEditUtil { } - public static Whitespace getWhiteSpaceBeforeToken(final ASTNode tokenNode, - final Language language) { - return getWhiteSpaceBeforeToken(tokenNode, language, null); - } - public static Whitespace getIndentWhiteSpaceBeforeToken(final ASTNode tokenNode, - final Language language, - TextRange textRange) { - return getWhiteSpaceBeforeToken(tokenNode, chooseLanguage(tokenNode, language), textRange); + final Language language) { + return getWhiteSpaceBeforeToken(tokenNode, chooseLanguage(tokenNode, language)); } private static Language chooseLanguage(final ASTNode tokenNode, final Language language) { @@ -461,8 +455,7 @@ public class CodeEditUtil { } public static Whitespace getWhiteSpaceBeforeToken(final ASTNode tokenNode, - final Language language, - TextRange significantRange) { + final Language language) { LOG.assertTrue(tokenNode != null); final PsiElement secondAsPsiElement = SourceTreeToPsiMap.treeElementToPsi(tokenNode); LOG.assertTrue(secondAsPsiElement != null); @@ -481,7 +474,7 @@ public class CodeEditUtil { settings, file); - return GeneralCodeFormatter.getWhiteSpaceBetweenTokens(pseudoText, settings, file.getFileType(), endOffset, significantRange); + return GeneralCodeFormatter.getWhiteSpaceBetweenTokens(pseudoText, settings, file.getFileType(), endOffset); } finally { settings.XML_KEEP_LINE_BREAKS = oldValue;