From ab483869ec667ba78bfe510bde9a8b975e661e48 Mon Sep 17 00:00:00 2001
From: Roman Shevchenko <roman.shevchenko@jetbrains.com>
Date: Tue, 22 Nov 2016 19:34:06 +0100
Subject: [PATCH] Cleanup (formatting; code reuse)

---
 .../extractor/differ/JavaExtractor.java       | 51 +++++++++----------
 1 file changed, 23 insertions(+), 28 deletions(-)

diff --git a/java/java-impl/src/com/intellij/psi/codeStyle/extractor/differ/JavaExtractor.java b/java/java-impl/src/com/intellij/psi/codeStyle/extractor/differ/JavaExtractor.java
index 1dbc898a36de..8308fd241e02 100644
--- a/java/java-impl/src/com/intellij/psi/codeStyle/extractor/differ/JavaExtractor.java
+++ b/java/java-impl/src/com/intellij/psi/codeStyle/extractor/differ/JavaExtractor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2000-2015 JetBrains s.r.o.
+ * Copyright 2000-2016 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.
@@ -32,35 +32,30 @@ import java.util.LinkedList;
 
 /**
  * @author Roman.Shein
- * @since 05.08.2015.
- * TODO: move from debugger-impl to more meaningful location?
- *
- *
+ * @since 05.08.2015
  */
 public class JavaExtractor implements LangCodeStyleExtractor {
-    @NotNull
-    @Override
-    public Differ getDiffer(final Project project, PsiFile psiFile, CodeStyleSettings settings) {
-        return new DifferBase(project, psiFile, settings) {
-            @Override
-            public String reformattedText() {
-                final JavaCodeFragment file = JavaCodeFragmentFactory.getInstance(project).
-                    createCodeBlockCodeFragment(myOrigText, myFile, false);
+  @NotNull
+  @Override
+  public Differ getDiffer(final Project project, PsiFile psiFile, CodeStyleSettings settings) {
+    return new DifferBase(project, psiFile, settings) {
+      @Override
+      public String reformattedText() {
+        JavaCodeFragment file = JavaCodeFragmentFactory.getInstance(project).createCodeBlockCodeFragment(myOrigText, myFile, false);
 
-                WriteCommandAction.runWriteCommandAction(myProject, "CodeStyleSettings extractor", "CodeStyleSettings extractor", () -> {
-                    final ASTNode treeElement = SourceTreeToPsiMap.psiElementToTree(file);
-                    assert (treeElement != null);
+        WriteCommandAction.runWriteCommandAction(myProject, "CodeStyleSettings extractor", "CodeStyleSettings extractor", () -> {
+          ASTNode treeElement = SourceTreeToPsiMap.psiToTreeNotNull(file);
+          SourceTreeToPsiMap.treeElementToPsi(new CodeFormatterFacade(mySettings, file.getLanguage()).processElement(treeElement));
+        }, file);
 
-                    SourceTreeToPsiMap.treeElementToPsi(new CodeFormatterFacade(mySettings, file.getLanguage()).processElement(treeElement));
-                }, file);
-                return file.getText();
-            }
-        };
-    }
+        return file.getText();
+      }
+    };
+  }
 
-    @NotNull
-    @Override
-    public Collection<Value.VAR_KIND> getCustomVarKinds() {
-        return new LinkedList<>();
-    }
-}
+  @NotNull
+  @Override
+  public Collection<Value.VAR_KIND> getCustomVarKinds() {
+    return new LinkedList<>();
+  }
+}
\ No newline at end of file