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

Migration to PsiFile-based CodeStyle API

Browse Source
This commit is contained in:
Rustam Vishnyakov
2018-04-16 16:31:26 +03:00
parent e2ba4cbd1e
commit dacc540d5d
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/java-impl/src/com/intellij/codeInsight/editorActions/BlockJoinLinesHandler.java
+2 -2
View File
@@ -15,12 +15,12 @@
*/
package com.intellij.codeInsight.editorActions;
import com.intellij.application.options.CodeStyle;
import com.intellij.lang.java.JavaLanguage;
import com.intellij.openapi.diagnostic.Logger;
import com.intellij.openapi.editor.Document;
import com.intellij.psi.*;
import com.intellij.psi.codeStyle.CodeStyleSettings;
import com.intellij.psi.codeStyle.CodeStyleSettingsManager;
import com.intellij.psi.codeStyle.CommonCodeStyleSettings;
import com.intellij.util.IncorrectOperationException;
import org.jetbrains.annotations.NotNull;
@@ -68,7 +68,7 @@ public class BlockJoinLinesHandler implements JoinLinesHandlerDelegate {
}
private static int getForceBraceSetting(PsiElement statement) {
CodeStyleSettings settings = CodeStyleSettingsManager.getSettings(statement.getProject());
CodeStyleSettings settings = CodeStyle.getSettings(statement.getContainingFile());
final CommonCodeStyleSettings codeStyleSettings = settings.getCommonSettings(JavaLanguage.INSTANCE);
if (statement instanceof PsiIfStatement) {
return codeStyleSettings.IF_BRACE_FORCE;