Replace deprecated methods for upcoming 2023.3 release (#5448)

2023.3 will have these members removed, so updating usages according to IJ documentation
bazelbuild · Oct 11, 2023 · f6a786b · f6a786b
1 parent 6431678
commit f6a786b
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 3 deletions.
diff --git a/cpp/src/com/google/idea/blaze/cpp/BlazeCWorkspace.java b/cpp/src/com/google/idea/blaze/cpp/BlazeCWorkspace.java
@@ -166,7 +166,8 @@ private OCWorkspaceImpl.ModifiableModel calculateConfigurations(
       ProgressIndicator indicator) {
 
     OCWorkspaceImpl.ModifiableModel workspaceModifiable =
-        OCWorkspaceImpl.getInstanceImpl(project).getModifiableModel(/* clear= */ true);
+        OCWorkspaceImpl.getInstanceImpl(project)
+            .getModifiableModel(OCWorkspace.LEGACY_CLIENT_KEY, true);
     ImmutableList<BlazeResolveConfiguration> configurations =
         configResolveData.getAllConfigurations();
     ExecutionRootPathResolver executionRootPathResolver =

diff --git a/cpp/src/com/google/idea/blaze/cpp/BlazeCompilerSettings.java b/cpp/src/com/google/idea/blaze/cpp/BlazeCompilerSettings.java
@@ -21,7 +21,9 @@
 import com.intellij.openapi.vfs.VirtualFile;
 import com.jetbrains.cidr.lang.CLanguageKind;
 import com.jetbrains.cidr.lang.OCLanguageKind;
+import com.jetbrains.cidr.lang.workspace.compiler.ClangCompilerKind;
 import com.jetbrains.cidr.lang.workspace.compiler.OCCompilerKind;
+import com.jetbrains.cidr.lang.workspace.compiler.UnknownCompilerKind;
 import java.io.File;
 import java.util.List;
 import javax.annotation.Nullable;
@@ -53,9 +55,9 @@ final class BlazeCompilerSettings {
 
   OCCompilerKind getCompiler(OCLanguageKind languageKind) {
     if (languageKind == CLanguageKind.C || languageKind == CLanguageKind.CPP) {
-      return OCCompilerKind.CLANG;
+      return ClangCompilerKind.INSTANCE;
     }
-    return OCCompilerKind.UNKNOWN;
+    return UnknownCompilerKind.INSTANCE;
   }
 
   File getCompilerExecutable(OCLanguageKind lang) {