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

CR-IC-1713 Make SpacingBuilder use correct language settings

Browse Source
This commit is contained in:
Rustam Vishnyakov
2013-08-02 17:57:45 +04:00
parent 9ea76a4ce9
commit dc0887496c
1 changed files with 29 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/lang-api/src/com/intellij/formatting/SpacingBuilder.java
+29 -1
View File
@@ -1,8 +1,11 @@
package com.intellij.formatting;
import com.intellij.lang.Language;
import com.intellij.psi.codeStyle.CodeStyleSettings;
import com.intellij.psi.codeStyle.CommonCodeStyleSettings;
import com.intellij.psi.tree.IElementType;
import com.intellij.psi.tree.TokenSet;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import java.util.ArrayList;
@@ -109,13 +112,38 @@ public class SpacingBuilder {
}
}
private final CodeStyleSettings myCodeStyleSettings;
private final CommonCodeStyleSettings myCodeStyleSettings;
private final List<SpacingRule> myRules = new ArrayList<SpacingRule>();
/**
* @param codeStyleSettings
* @deprecated Use other constructors!
*/
@Deprecated
public SpacingBuilder(CodeStyleSettings codeStyleSettings) {
// TODO: remove deprecated method (v.14)
myCodeStyleSettings = codeStyleSettings;
}
/**
* Creates SpacingBuilder with given code style settings and language whose settings must be used.
* @param codeStyleSettings The root code style settings.
* @param language The language to obtain settings for.
*/
public SpacingBuilder(@NotNull CodeStyleSettings codeStyleSettings, @NotNull Language language) {
myCodeStyleSettings = codeStyleSettings.getCommonSettings(language);
}
/**
* Creates SpacingBuilder with given language code style settings.
* @param languageCodeStyleSettings The language code style settings. Note that <code>getLanguage()</code> method must not
* return null!
*/
public SpacingBuilder(@NotNull CommonCodeStyleSettings languageCodeStyleSettings) {
assert languageCodeStyleSettings.getLanguage() != null : "Only language code style settings are accepted (getLanguage() != null)";
myCodeStyleSettings = languageCodeStyleSettings;
}
public RuleBuilder after(IElementType elementType) {
return new RuleBuilder(new RuleCondition(null, TokenSet.create(elementType), null));
}