Issue 17356. Apply selection returned from formatter to the SourceViewer.

editor/tools/plugins/com.google.dart.tools.ui/src/com/google/dart/tools/ui/internal/text/editor/DartEditor.java

 /*
  * Copyright (c) 2012, the Dart project authors.
  * 
  * Licensed under the Eclipse Public License v1.0 (the "License"); you may not use this file except
  * in compliance with the License. You may obtain a copy of the License at
  * 
  * http://www.eclipse.org/legal/epl-v10.html
  * 
  * Unless required by applicable law or agreed to in writing, software distributed under the License
  * is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express
@@ skipping 733 matching lines @@
       @Override
       protected IStatus run(IProgressMonitor monitor) {
 
         MessageConsole console = DartCore.getConsole();
 
         if (PRINT_TO_CONSOLE) {
           console.clear();
           console.println("Formatting " + file.getName() + " ...");
         }
 
-        final IDocument document = getSourceViewer().getDocument();
+        final ISourceViewer sourceViewer = getSourceViewer();
+        final IDocument document = sourceViewer.getDocument();
 
         try {
 
-          final Point[] selection = new Point[1];
+          final Point initialSelection = new Point(-1, 0);
           Display.getDefault().syncExec(new Runnable() {
             @Override
             public void run() {
-              selection[0] = getSourceViewer().getSelectedRange();
+              Point selection = sourceViewer.getSelectedRange();
+              initialSelection.x = selection.x;
+              initialSelection.y = selection.y;
             }
           });
 
           if (DartFormatter.isDartStyleEnabled()) {
-            DartFormatter.DartStyleRunner.formatFile(file, selection[0], monitor);
+            final Point newSelection = DartFormatter.DartStyleRunner.formatFile(
+                file,
+                initialSelection,
+                monitor);
+            Display.getDefault().syncExec(new Runnable() {
+              @Override
+              public void run() {
+                sourceViewer.setSelectedRange(newSelection.x, newSelection.y);
+              }
+            });
             return Status.OK_STATUS;
           }
 
           final String unformattedSource = document.get();
 
           final FormattedSource formatResult = DartFormatter.format(
               unformattedSource,
-              selection[0],
+              initialSelection,
               monitor);
 
           Display.getDefault().syncExec(new Runnable() {
             @Override
             public void run() {
               if (!formatResult.source.equals(unformattedSource)) {
                 try {
                   document.replace(
                       formatResult.changeOffset,
                       formatResult.changeLength,
                       formatResult.changeReplacement);
-                  getSourceViewer().revealRange(
+                  sourceViewer.revealRange(
                       formatResult.selectionOffset,
                       formatResult.selectionLength);
-                  getSourceViewer().setSelectedRange(
+                  sourceViewer.setSelectedRange(
                       formatResult.selectionOffset,
                       formatResult.selectionLength);
                 } catch (BadLocationException e) {
                   DartToolsPlugin.log(e);
                 }
               }
             }
           });
         } catch (Exception e) {
 
@@ skipping 3403 matching lines @@
     }
   }
 
   private void updateOutlinePageNew(Outline outline) {
     if (fOutlinePage_NEW != null && outline != null) {
       int offset = getSourceViewer().getSelectedRange().x;
       fOutlinePage_NEW.setInput(outline, offset);
     }
   }
 }