Disaply compile error position in diff viewer

plugins/org.chromium.debug.ui/src/org/chromium/debug/ui/liveedit/WizardLogicBuilder.java

 // Copyright (c) 2010 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 package org.chromium.debug.ui.liveedit;
 
 import static org.chromium.debug.ui.DialogUtils.createConstant;
 import static org.chromium.debug.ui.DialogUtils.createErrorOptional;
 import static org.chromium.debug.ui.DialogUtils.createOptional;
 import static org.chromium.debug.ui.DialogUtils.createProcessor;
@@ skipping 23 matching lines @@
 import org.chromium.debug.ui.DialogUtils.ValueSource;
 import org.chromium.debug.ui.WizardUtils.LogicBasedWizard;
 import org.chromium.debug.ui.WizardUtils.NextPageEnabler;
 import org.chromium.debug.ui.WizardUtils.PageElements;
 import org.chromium.debug.ui.WizardUtils.PageImpl;
 import org.chromium.debug.ui.WizardUtils.PageListener;
 import org.chromium.debug.ui.WizardUtils.WizardFinishController;
 import org.chromium.debug.ui.WizardUtils.WizardFinisher;
 import org.chromium.debug.ui.WizardUtils.WizardLogic;
 import org.chromium.debug.ui.actions.ChooseVmControl;
+import org.chromium.debug.ui.liveedit.LiveEditDiffViewer.Input;
 import org.chromium.debug.ui.liveedit.PushChangesWizard.FinisherDelegate;
+import org.chromium.sdk.TextStreamPosition;
 import org.chromium.sdk.UpdatableScript.ChangeDescription;
+import org.chromium.sdk.UpdatableScript.CompileErrorFailure;
+import org.eclipse.osgi.util.NLS;
 
 /**
  * Creates Updater-based logic implementation of the wizard. It is responsible for proper data
  * manipulation and view control updates.
  * <p>
  * The wizard pages are arranged in graph with one fork:<br>
  * 'choose vm' -&gt;
  * <ul>
  * <li>[single vm path] -&gt; 'textual preview' -&gt; 'v8 preview'
  * <li>[multiple vm path] -&gt; 'multiple vm stub'
@@ skipping 220 matching lines @@
     });
 
     // Parses raw preview value and converts it into a form suitable for the viewer; also handles
     // errors that become warnings.
     final ValueProcessor<Optional<? extends LiveEditDiffViewer.Input>> previewValue =
       createProcessor(handleErrors(
           new NormalExpression<LiveEditDiffViewer.Input>() {
             @Calculate
             public Optional<? extends LiveEditDiffViewer.Input> calculate(
                 PreviewLoader.Data previewRawResultParam) {
-              PushChangesPlan changesPlan = singlePlanValue.getValue();
-              ChangeDescription changeDescription = previewRawResultParam.getChangeDescription();
-              Optional<LiveEditDiffViewer.Input> result;
-              if (changeDescription == null) {
-                result = createOptional(null);
-              } else {
-                try {
+              final PushChangesPlan changesPlan = singlePlanValue.getValue();
+
+              return previewRawResultParam.accept(
+                  new PreviewLoader.Data.Visitor<Optional<LiveEditDiffViewer.Input>>() {
+                @Override
+                public Optional<LiveEditDiffViewer.Input> visitSuccess(
+                    ChangeDescription changeDescription) {
+                  if (changeDescription == null) {
+                    return createOptional(null);
+                  } else {
+                    try {
+                      LiveEditDiffViewer.Input viewerInput =
+                          PushResultParser.createViewerInput(changeDescription, changesPlan, true);
+                      return createOptional(viewerInput);
+                    } catch (RuntimeException e) {
+                      ChromiumDebugPlugin.log(e);
+                      return createErrorOptional(new Message(
+                          "Error in getting preview: " + e.toString(), MessagePriority.WARNING));

[apavlov, 2013/01/24 13:06:27]

"Failed to create preview". Don't you want to i18n-ize it?

I also suggest that you use NLS.bind() here.

[Peter Rybin, 2013/01/24 14:08:22]

Done.

+                    }
+                  }
+                }
+
+                @Override
+                public Optional<Input> visitCompileError(CompileErrorFailure compileError) {
                   LiveEditDiffViewer.Input viewerInput =
-                      PushResultParser.createViewerInput(changeDescription, changesPlan, true);
-                  result = createOptional(viewerInput);
-                } catch (RuntimeException e) {
-                  ChromiumDebugPlugin.log(e);
-                  result = createErrorOptional(new Message(
-                      "Error in getting preview: " + e.toString(), MessagePriority.WARNING));
+                      PushResultParser.createCompileErrorViewerInput(compileError, changesPlan,
+                          true);
+                  return createOptional(viewerInput);
                 }
-              }
-              return result;
+              });
             }
             @DependencyGetter
             public ValueSource<Optional<PreviewLoader.Data>>
                 previewRawResultValueSource() {
               return previewRawResultValue;
             }
           }));
 
 
 
@@ skipping 15 matching lines @@
         v8PreviewPage.getPageElements().getPreviewViewer().setInput(viewerInput);
       }
     };
     updater.addConsumer(scope, v8PreviewInputSetter);
     updater.addDependency(v8PreviewInputSetter, previewValue);
 
     // A warning generator that collects them from v8 preview loader.
     final ValueProcessor<Optional<Void>> warningValue = createProcessor(
         new Gettable<Optional<Void>>() {
       public Optional<Void> getValue() {
-        Optional<?> previewResult = previewValue.getValue();
+        Optional<PreviewLoader.Data> previewResult = previewRawResultValue.getValue();
         if (previewResult.isNormal()) {
-          return createOptional(null);
+          PreviewLoader.Data data = previewResult.getNormal();
+          return data.accept(new PreviewLoader.Data.Visitor<Optional<Void>>() {
+            @Override public Optional<Void> visitSuccess(ChangeDescription changeDescription) {
+              return createOptional(null);
+            }
+            @Override
+            public Optional<Void> visitCompileError(CompileErrorFailure compileError) {
+              TextStreamPosition start = compileError.getStartPosition();
+              String messageString = NLS.bind("Compile error: {0} ({1}:{2})",
+                  new Object[] { compileError.getCompilerMessage(),
+                  start.getLine(), start.getColumn() });
+              return createErrorOptional(
+                  new Message (messageString, MessagePriority.BLOCKING_PROBLEM));

[apavlov, 2013/01/24 13:06:27]

stray whitespace before '('

[Peter Rybin, 2013/01/24 14:08:22]

Done.

+            }
+          });
         } else {
           return createErrorOptional(previewResult.errorMessages());
         }
       }
     });
     updater.addConsumer(scope, warningValue);
     updater.addSource(scope, warningValue);
-    updater.addDependency(warningValue, previewValue);
+    updater.addDependency(warningValue, previewRawResultValue);
 
     // A finisher delegate source, that does not actually depend on most of the code above.
     final ValueProcessor<? extends Optional<FinisherDelegate>> wizardFinisher =
         createProcessor((
             new Gettable<Optional<FinisherDelegate>>() {
           public Optional<FinisherDelegate> getValue() {
             FinisherDelegate finisher =
                 new PushChangesWizard.SingleVmFinisher(singlePlanValue.getValue());
             return createOptional(finisher);
           }
@@ skipping 52 matching lines @@
       public ValueSource<? extends Optional<? extends FinisherDelegate>>
           getFinisherDelegateValue() {
         return wizardFinisher;
       }
       public ValueSource<Optional<Void>> getWarningValue() {
         return warningValue;
       }
     };
   }
 }