Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
Menu
Open sidebar
小 白蛋
Intellij Community
Commits
dacc540d
Commit
dacc540d
authored
7 years ago
by
Rustam Vishnyakov
Browse files
Options
Download
Email Patches
Plain Diff
Migration to PsiFile-based CodeStyle API
parent
e2ba4cbd
Branches unavailable
Tags unavailable
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
java/java-impl/src/com/intellij/codeInsight/editorActions/BlockJoinLinesHandler.java
+2
-2
...llij/codeInsight/editorActions/BlockJoinLinesHandler.java
with
2 additions
and
2 deletions
+2
-2
java/java-impl/src/com/intellij/codeInsight/editorActions/BlockJoinLinesHandler.java
+
2
-
2
View file @
dacc540d
...
...
@@ -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
=
CodeStyle
SettingsManager
.
getSettings
(
statement
.
get
Project
());
CodeStyleSettings
settings
=
CodeStyle
.
getSettings
(
statement
.
get
ContainingFile
());
final
CommonCodeStyleSettings
codeStyleSettings
=
settings
.
getCommonSettings
(
JavaLanguage
.
INSTANCE
);
if
(
statement
instanceof
PsiIfStatement
)
{
return
codeStyleSettings
.
IF_BRACE_FORCE
;
...
...
This diff is collapsed.
Click to expand it.
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment
Menu
Projects
Groups
Snippets
Help