From dacc540d5d3210f6de0b7343592330f4a63e0ef6 Mon Sep 17 00:00:00 2001
From: Rustam Vishnyakov <rustam.vishnyakov@jetbrains.com>
Date: Mon, 16 Apr 2018 16:31:26 +0300
Subject: [PATCH] Migration to PsiFile-based CodeStyle API

---
 .../codeInsight/editorActions/BlockJoinLinesHandler.java      | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/java/java-impl/src/com/intellij/codeInsight/editorActions/BlockJoinLinesHandler.java b/java/java-impl/src/com/intellij/codeInsight/editorActions/BlockJoinLinesHandler.java
index a3842e088b2c..892bade71c04 100644
--- a/java/java-impl/src/com/intellij/codeInsight/editorActions/BlockJoinLinesHandler.java
+++ b/java/java-impl/src/com/intellij/codeInsight/editorActions/BlockJoinLinesHandler.java
@@ -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;