Fix build after changes

Fix rebase

Author: mildagle

base/src/com/google/idea/blaze/base/command/info/BlazeInfoRunnerImpl.java

@@ -25,6 +25,7 @@
 import com.google.idea.blaze.base.command.BlazeCommandName;
 import com.google.idea.blaze.base.command.buildresult.BuildResultHelper;
 import com.google.idea.blaze.base.scope.BlazeContext;
+import com.google.idea.blaze.base.settings.Blaze;
 import com.google.idea.blaze.base.settings.BuildSystemName;
 import com.intellij.openapi.project.Project;
 import java.io.InputStream;
@@ -39,10 +40,10 @@ public ListenableFuture<byte[]> runBlazeInfoGetBytes(
       BlazeContext context,
       List<String> blazeFlags,
       String key) {
+    String binaryPath = Blaze.getBuildSystemProvider(project).getBinaryPath(project);
     boolean isExecutable = ExternalTask.builder().args("which", binaryPath).build().run() == 0;
     if (!isExecutable) {
       BazelBinaryNotFoundNotification.show(binaryPath);
-      throw new BlazeInfoException(-1, binaryPath + " cannot be executed");
     }
     return BlazeExecutor.getInstance()
         .submit(

scala/src/com/google/idea/blaze/scala/libraries/BlazeScalaAttachSourceProvider.java

@@ -13,7 +13,6 @@
 import com.google.idea.blaze.scala.sync.model.BlazeScalaSyncData;
 import com.google.idea.common.experiments.BoolExperiment;
 import com.google.idea.common.util.Transactions;
-import com.google.idea.sdkcompat.general.BaseSdkCompat;
 import com.google.idea.sdkcompat.java.AttachSourcesProviderAdapter;
 import com.intellij.openapi.application.ApplicationManager;
 import com.intellij.openapi.application.TransactionGuard;
@@ -28,6 +27,7 @@
 import java.util.Collection;
 import java.util.List;
 import javax.annotation.Nullable;
+import com.intellij.openapi.externalSystem.service.project.IdeModifiableModelsProviderImpl;
 
 public class BlazeScalaAttachSourceProvider extends AttachSourcesProviderAdapter {
 
@@ -141,8 +141,7 @@ private static void attachSources(
     ApplicationManager.getApplication()
         .runWriteAction(
             () -> {
-              IdeModifiableModelsProvider modelsProvider =
-                  BaseSdkCompat.createModifiableModelsProvider(project);
+              IdeModifiableModelsProvider modelsProvider = new IdeModifiableModelsProviderImpl(project);
               for (BlazeLibrary blazeLibrary : librariesToAttachSourceTo) {
                 // Make sure we don't do it twice
                 if (AttachedSourceJarManager.getInstance(project)