"Pubspec has been edited" is stuck in Android Studio Koala resolution (flutter#7541)

This resolves flutter#7538

Author: jwren

flutter-idea/src/io/flutter/inspections/FlutterDependencyInspection.java

@@ -87,7 +87,7 @@ private ProblemDescriptor[] createProblemDescriptors(@NotNull final InspectionMa
   }
 
   private interface SdkAction {
-    void run(FlutterSdk sdk, @NotNull PubRoot root, @NotNull Project project);
+    Process run(FlutterSdk sdk, @NotNull PubRoot root, @NotNull Project project);
   }
 
   private static class PackageUpdateFix extends IntentionAndQuickFixAction {
@@ -126,6 +126,8 @@ public void applyFix(@NotNull final Project project, @NotNull final PsiFile psiF
 
       // TODO(skybrian) analytics?
       mySdkAction.run(sdk, root, project);
+
+      DaemonCodeAnalyzer.getInstance(project).restart(psiFile);
     }
   }
 
@@ -158,7 +160,7 @@ public boolean startInWriteAction() {
     @Override
     public void applyFix(@NotNull final Project project, @NotNull final PsiFile psiFile, @Nullable final Editor editor) {
       myIgnoredPubspecPaths.add(myPubspecPath);
-      DaemonCodeAnalyzer.getInstance(project).restart();
+      DaemonCodeAnalyzer.getInstance(project).restart(psiFile);
     }
   }
 }

flutter-idea/src/io/flutter/pub/PubRoot.java

@@ -24,6 +24,7 @@
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
+import java.io.File;
 import java.util.List;
 import java.util.Map;
 
@@ -281,7 +282,6 @@ public VirtualFile getPackagesFile() {
     if (packages != null && !packages.isDirectory()) {
       return packages;
     }
-
     return null;
   }
 
@@ -300,19 +300,27 @@ public VirtualFile getPackagesFile() {
   }
 
   /**
-   * Returns true if the packages are up to date wrt pubspec.yaml.
+   * Returns true if the packages are up-to-date with regard to the `pubspec.yaml`. The `.packages` file is used if no
+   * `.tool/package_config.json` is found.  The default value returned is to return false.
    */
   public boolean hasUpToDatePackages() {
+    // See context at these URLs for the reason we can't use VirtualFile#getTimeStamp()
+    // https://github.com/flutter/flutter-intellij/issues/7538
+    // https://intellij-support.jetbrains.com/hc/en-us/community/posts/8009750602514-VirtualFile-is-not-refreshed
+
     final VirtualFile configFile = getPackageConfigFile();
     if (configFile != null) {
-      return pubspec.getTimeStamp() < configFile.getTimeStamp();
+      long pubspecLastModified = new File(pubspec.getPath()).lastModified();
+      long configLastModified = new File(configFile.getPath()).lastModified();
+      return pubspecLastModified < configLastModified;
     }
     final VirtualFile packagesFile = getPackagesFile();
-    if (packagesFile == null) {
-      return false;
+    if (packagesFile != null) {
+      long pubspecLastModified = new File(pubspec.getPath()).lastModified();
+      long packagesLastModified = new File(packagesFile.getPath()).lastModified();
+      return pubspecLastModified < packagesLastModified;
     }
-
-    return pubspec.getTimeStamp() < packagesFile.getTimeStamp();
+    return false;
   }
 
   @Nullable