diff options
Diffstat (limited to 'platform/lang-impl/src/com/intellij/codeInsight/actions')
| -rw-r--r-- | platform/lang-impl/src/com/intellij/codeInsight/actions/FormatChangedTextUtil.java | 3 | ||||
| -rw-r--r-- | platform/lang-impl/src/com/intellij/codeInsight/actions/OptimizeImportsProcessor.java | 5 |
2 files changed, 5 insertions, 3 deletions
diff --git a/platform/lang-impl/src/com/intellij/codeInsight/actions/FormatChangedTextUtil.java b/platform/lang-impl/src/com/intellij/codeInsight/actions/FormatChangedTextUtil.java index 0bc36c17325d..3b51cc9ad976 100644 --- a/platform/lang-impl/src/com/intellij/codeInsight/actions/FormatChangedTextUtil.java +++ b/platform/lang-impl/src/com/intellij/codeInsight/actions/FormatChangedTextUtil.java @@ -20,6 +20,7 @@ import com.intellij.openapi.application.Result; import com.intellij.openapi.diagnostic.Logger; import com.intellij.openapi.editor.Document; import com.intellij.openapi.editor.EditorFactory; +import com.intellij.openapi.editor.impl.EditorFactoryImpl; import com.intellij.openapi.editor.markup.RangeHighlighter; import com.intellij.openapi.module.ModifiableModuleModel; import com.intellij.openapi.module.Module; @@ -281,7 +282,7 @@ public class FormatChangedTextUtil { @NotNull private static List<TextRange> calculateChangedTextRanges(@NotNull Project project, @NotNull PsiFile file, @NotNull String contentFromVcs) { - Document documentFromVcs = EditorFactory.getInstance().createDocument(contentFromVcs); + Document documentFromVcs = ((EditorFactoryImpl)EditorFactory.getInstance()).createDocument(contentFromVcs, true, false); Document document = PsiDocumentManager.getInstance(project).getDocument(file); if (document == null) { diff --git a/platform/lang-impl/src/com/intellij/codeInsight/actions/OptimizeImportsProcessor.java b/platform/lang-impl/src/com/intellij/codeInsight/actions/OptimizeImportsProcessor.java index ed254aec1e8b..6cdb063c0434 100644 --- a/platform/lang-impl/src/com/intellij/codeInsight/actions/OptimizeImportsProcessor.java +++ b/platform/lang-impl/src/com/intellij/codeInsight/actions/OptimizeImportsProcessor.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2011 JetBrains s.r.o. + * Copyright 2000-2014 JetBrains s.r.o. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -82,8 +82,9 @@ public class OptimizeImportsProcessor extends AbstractLayoutCodeProcessor { public void run() { CodeStyleManagerImpl.setSequentialProcessingAllowed(false); try { - for (Runnable runnable : runnables) + for (Runnable runnable : runnables) { runnable.run(); + } } finally { CodeStyleManagerImpl.setSequentialProcessingAllowed(true); |