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

RUBY-17536: Fix inconsistent injected<->host conversions when default offset value is used on line indent adjustment

Browse Source
This commit is contained in:
Valentin Fondaratov
2016-02-24 15:22:59 +03:00
parent b394524784
commit 0078c22016
1 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/lang-impl/src/com/intellij/psi/impl/source/codeStyle/CodeStyleManagerImpl.java
+6 -3
View File
@@ -368,7 +368,7 @@ public class CodeStyleManagerImpl extends CodeStyleManager {
}
private int doAdjustLineIndentByOffset(@NotNull PsiFile file, int offset) {
return new CodeStyleManagerRunnable<Integer>(this, FormattingMode.ADJUST_INDENT) {
final Integer result = new CodeStyleManagerRunnable<Integer>(this, FormattingMode.ADJUST_INDENT) {
@Override
protected Integer doPerform(int offset, TextRange range) {
return FormatterEx.getInstanceEx().adjustLineIndent(myModel, mySettings, myIndentOptions, offset, mySignificantRange);
@@ -381,9 +381,12 @@ public class CodeStyleManagerImpl extends CodeStyleManager {
@Override
protected Integer adjustResultForInjected(Integer result, DocumentWindow documentWindow) {
return documentWindow.hostToInjected(result);
return result != null ? documentWindow.hostToInjected(result)
: null;
}
}.perform(file, offset, null, offset);
}.perform(file, offset, null, null);
return result != null ? result : offset;
}
@Override