Restrict white space strategy by language

This commit is contained in:
Denis.Zhdanov
2013-02-02 15:05:31 +04:00
parent cd70acac56
commit d6e3d9cad7
2 changed files with 11 additions and 5 deletions
@@ -109,6 +109,11 @@ public class CompositeWhiteSpaceFormattingStrategy implements WhiteSpaceFormatti
@Override
public boolean containsWhitespacesOnly(@NotNull ASTNode node) {
for (WhiteSpaceFormattingStrategy strategy : myStrategies) {
if (strategy.containsWhitespacesOnly(node)) {
return true;
}
}
return false;
}
@@ -19,6 +19,7 @@ import com.intellij.codeInsight.actions.ReformatAndOptimizeImportsProcessor;
import com.intellij.codeInsight.actions.ReformatCodeProcessor;
import com.intellij.lang.ASTFactory;
import com.intellij.lang.ASTNode;
import com.intellij.lang.Language;
import com.intellij.openapi.command.CommandProcessor;
import com.intellij.openapi.util.TextRange;
import com.intellij.psi.PsiElement;
@@ -254,12 +255,12 @@ public class FormatterUtil {
if (node == null) return false;
if (isWhitespaceOrEmpty(node)) return true;
for (WhiteSpaceFormattingStrategy strategy : WhiteSpaceFormattingStrategyFactory.getAllStrategies()) {
if (strategy.containsWhitespacesOnly(node)) {
return true;
}
PsiElement psi = node.getPsi();
if (psi == null) {
return false;
}
return false;
Language language = psi.getLanguage();
return WhiteSpaceFormattingStrategyFactory.getStrategy(language).containsWhitespacesOnly(node);
}
/**