commit 010828ada416f29cffa96c1aa0e86de44dc6454d
author Mike Fairhurst <mfairhurst@google.com> Fri Aug 10 23:24:43 2018 +0000
committer commit-bot@chromium.org <commit-bot@chromium.org> Fri Aug 10 23:24:43 2018 +0000
tree 1a7998581d24fbd090a2d5bee51b078de4e5cefb
parent 707040bfa0ff4a81fbd0ba6bc5c9dbab1d6ab0a4

Fix issue with pub upgrade not running on existing plugins.

Code trying to run "pub upgrade" was blocked behind "runPub" being
false. Instead, expect the pub command to run. If the folder exists, run
"pub upgrade," and if it doesn't, run 'pub get'.

Change-Id: Ia37bf11d08e921e31d2ed4410210d03b8dbe1b00
Reviewed-on: https://dart-review.googlesource.com/69440
Reviewed-by: Brian Wilkerson <brianwilkerson@google.com>
Commit-Queue: Mike Fairhurst <mfairhurst@google.com>

pkg/analysis_server/lib/src/plugin/plugin_manager.dart

diff --git a/pkg/analysis_server/lib/src/plugin/plugin_manager.dart b/pkg/analysis_server/lib/src/plugin/plugin_manager.dart
index 3a3bf2a..dace1bd 100644
--- a/pkg/analysis_server/lib/src/plugin/plugin_manager.dart
+++ b/pkg/analysis_server/lib/src/plugin/plugin_manager.dart
@@ -517,10 +517,10 @@
     if (parentFolder.exists) {
       Folder executionFolder =
           parentFolder.getChildAssumingFolder(pluginFolder.shortName);
-      return _computePaths(executionFolder);
+      return _computePaths(executionFolder, pubCommand: 'upgrade');
     }
     Folder executionFolder = pluginFolder.copyTo(parentFolder);
-    return _computePaths(executionFolder, runPub: true);
+    return _computePaths(executionFolder, pubCommand: 'get');
   }
 
   /**
@@ -681,9 +681,11 @@
   /**
    * Compute the paths to be returned by the enclosing method given that the
    * plugin should exist in the given [pluginFolder].
+   *
+   * Runs pub if [pubCommand] is provided and not null.
    */
   List<String> _computePaths(Folder pluginFolder,
-      {bool runPub: false, Workspace workspace}) {
+      {String pubCommand, Workspace workspace}) {
     File pluginFile = pluginFolder
         .getChildAssumingFolder('bin')
         .getChildAssumingFile('plugin.dart');
@@ -692,23 +694,21 @@
     }
     String reason;
     File packagesFile = pluginFolder.getChildAssumingFile('.packages');
-    bool packagesFilePreExists = packagesFile.exists;
-    if (runPub) {
+    if (pubCommand != null) {
       String vmPath = Platform.executable;
       String pubPath = path.join(path.dirname(vmPath), 'pub');
       if (Platform.isWindows) {
         // Process.run requires the `.bat` suffix on Windows
         pubPath = '$pubPath.bat';
       }
-      String pubSubcommand = packagesFilePreExists ? 'upgrade' : 'get';
-      ProcessResult result = Process.runSync(pubPath, <String>[pubSubcommand],
+      ProcessResult result = Process.runSync(pubPath, <String>[pubCommand],
           stderrEncoding: utf8,
           stdoutEncoding: utf8,
           workingDirectory: pluginFolder.path,
           environment: {_pubEnvironmentKey: _getPubEnvironmentValue()});
       if (result.exitCode != 0) {
         StringBuffer buffer = new StringBuffer();
-        buffer.writeln('Failed to run pub $pubSubcommand');
+        buffer.writeln('Failed to run pub $pubCommand');
         buffer.writeln('  pluginFolder = ${pluginFolder.path}');
         buffer.writeln('  exitCode = ${result.exitCode}');
         buffer.writeln('  stdout = ${result.stdout}');
@@ -720,7 +720,7 @@
         reason ??= 'File "${packagesFile.path}" does not exist.';
         packagesFile = null;
       }
-    } else if (!packagesFilePreExists) {
+    } else if (!packagesFile.exists) {
       if (workspace != null) {
         packagesFile =
             _createPackagesFile(pluginFolder, workspace.packageUriResolver);