-
Notifications
You must be signed in to change notification settings - Fork 304
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Import Android Studio 2023.2.1 Canary 4 (2023.2.1.4)
PiperOrigin-RevId: 565774266
- Loading branch information
1 parent
60b46f3
commit ac5c231
Showing
10 changed files
with
341 additions
and
57 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
66 changes: 66 additions & 0 deletions
66
...pat/as223/com/google/idea/blaze/android/resources/BlazeLightResourceClassServiceBase.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,66 @@ | ||
| /* | ||
| * Copyright 2016 The Bazel Authors. All rights reserved. | ||
| * | ||
| * Licensed under the Apache License, Version 2.0 (the "License"); | ||
| * you may not use this file except in compliance with the License. | ||
| * You may obtain a copy of the License at | ||
| * | ||
| * http://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, software | ||
| * distributed under the License is distributed on an "AS IS" BASIS, | ||
| * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| * See the License for the specific language governing permissions and | ||
| * limitations under the License. | ||
| */ | ||
| package com.google.idea.blaze.android.resources; | ||
|
|
||
| import com.android.tools.idea.projectsystem.LightResourceClassService; | ||
| import com.google.common.annotations.VisibleForTesting; | ||
| import com.google.common.collect.ImmutableSet; | ||
| import com.google.common.collect.Maps; | ||
| import com.google.common.collect.Sets; | ||
| import com.google.idea.blaze.base.sync.data.BlazeDataStorage; | ||
| import com.google.idea.common.experiments.FeatureRolloutExperiment; | ||
| import com.intellij.openapi.module.Module; | ||
| import com.intellij.psi.PsiClass; | ||
| import java.util.Collection; | ||
| import java.util.Map; | ||
| import java.util.Set; | ||
|
|
||
| /** Implementation of {@link LightResourceClassService} set up at Blaze sync time. */ | ||
| public abstract class BlazeLightResourceClassServiceBase implements LightResourceClassService { | ||
|
|
||
| @VisibleForTesting | ||
| public static final FeatureRolloutExperiment workspaceResourcesFeature = | ||
| new FeatureRolloutExperiment("aswb.workspace.light.class.enabled"); | ||
|
|
||
| Map<String, BlazeRClass> rClasses = Maps.newHashMap(); | ||
| Map<Module, BlazeRClass> rClassesByModule = Maps.newHashMap(); | ||
| final Set<BlazeRClass> allRClasses = Sets.newHashSet(); | ||
|
|
||
| @Override | ||
| public Collection<? extends PsiClass> getLightRClassesAccessibleFromModule( | ||
| Module module, boolean includeTest) { | ||
| if (workspaceResourcesFeature.isEnabled() | ||
| && module.getName().equals(BlazeDataStorage.WORKSPACE_MODULE_NAME)) { | ||
| // Returns all the packages in resource modules, and all the workspace packages that | ||
| // have previously been asked for. All `res/` directories in our project should belong to a | ||
| // resource module. For java sources, IntelliJ will ask for explicit resource package by | ||
| // calling `getLightRClasses` at which point we can create the package. This is not completely | ||
| // correct and the autocomplete will be slightly off when initial `R` is typed in the editor, | ||
| // but this workaround is being used to mitigate issues (b/136685602) while resources | ||
| // are re-worked. | ||
| return allRClasses; | ||
| } else { | ||
| return rClasses.values(); | ||
| } | ||
| } | ||
|
|
||
| @Override | ||
| public Collection<? extends PsiClass> getLightRClassesDefinedByModule( | ||
| Module module, boolean includeTestClasses) { | ||
| BlazeRClass rClass = rClassesByModule.get(module); | ||
| return rClass == null ? ImmutableSet.of() : ImmutableSet.of(rClass); | ||
| } | ||
| } |
66 changes: 66 additions & 0 deletions
66
...pat/as231/com/google/idea/blaze/android/resources/BlazeLightResourceClassServiceBase.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,66 @@ | ||
| /* | ||
| * Copyright 2016 The Bazel Authors. All rights reserved. | ||
| * | ||
| * Licensed under the Apache License, Version 2.0 (the "License"); | ||
| * you may not use this file except in compliance with the License. | ||
| * You may obtain a copy of the License at | ||
| * | ||
| * http://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, software | ||
| * distributed under the License is distributed on an "AS IS" BASIS, | ||
| * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| * See the License for the specific language governing permissions and | ||
| * limitations under the License. | ||
| */ | ||
| package com.google.idea.blaze.android.resources; | ||
|
|
||
| import com.android.tools.idea.projectsystem.LightResourceClassService; | ||
| import com.google.common.annotations.VisibleForTesting; | ||
| import com.google.common.collect.ImmutableSet; | ||
| import com.google.common.collect.Maps; | ||
| import com.google.common.collect.Sets; | ||
| import com.google.idea.blaze.base.sync.data.BlazeDataStorage; | ||
| import com.google.idea.common.experiments.FeatureRolloutExperiment; | ||
| import com.intellij.openapi.module.Module; | ||
| import com.intellij.psi.PsiClass; | ||
| import java.util.Collection; | ||
| import java.util.Map; | ||
| import java.util.Set; | ||
|
|
||
| /** Implementation of {@link LightResourceClassService} set up at Blaze sync time. */ | ||
| public abstract class BlazeLightResourceClassServiceBase implements LightResourceClassService { | ||
|
|
||
| @VisibleForTesting | ||
| public static final FeatureRolloutExperiment workspaceResourcesFeature = | ||
| new FeatureRolloutExperiment("aswb.workspace.light.class.enabled"); | ||
|
|
||
| Map<String, BlazeRClass> rClasses = Maps.newHashMap(); | ||
| Map<Module, BlazeRClass> rClassesByModule = Maps.newHashMap(); | ||
| final Set<BlazeRClass> allRClasses = Sets.newHashSet(); | ||
|
|
||
| @Override | ||
| public Collection<? extends PsiClass> getLightRClassesAccessibleFromModule( | ||
| Module module, boolean includeTest) { | ||
| if (workspaceResourcesFeature.isEnabled() | ||
| && module.getName().equals(BlazeDataStorage.WORKSPACE_MODULE_NAME)) { | ||
| // Returns all the packages in resource modules, and all the workspace packages that | ||
| // have previously been asked for. All `res/` directories in our project should belong to a | ||
| // resource module. For java sources, IntelliJ will ask for explicit resource package by | ||
| // calling `getLightRClasses` at which point we can create the package. This is not completely | ||
| // correct and the autocomplete will be slightly off when initial `R` is typed in the editor, | ||
| // but this workaround is being used to mitigate issues (b/136685602) while resources | ||
| // are re-worked. | ||
| return allRClasses; | ||
| } else { | ||
| return rClasses.values(); | ||
| } | ||
| } | ||
|
|
||
| @Override | ||
| public Collection<? extends PsiClass> getLightRClassesDefinedByModule( | ||
| Module module, boolean includeTestClasses) { | ||
| BlazeRClass rClass = rClassesByModule.get(module); | ||
| return rClass == null ? ImmutableSet.of() : ImmutableSet.of(rClass); | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
46 changes: 46 additions & 0 deletions
46
...32/com/google/idea/blaze/android/cppimpl/debug/BlazeNativeDebuggerStateSourceMapping.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,46 @@ | ||
| /* | ||
| * Copyright (C) 2023 The Android Open Source Project | ||
| * | ||
| * Licensed under the Apache License, Version 2.0 (the "License"); | ||
| * you may not use this file except in compliance with the License. | ||
| * You may obtain a copy of the License at | ||
| * | ||
| * http://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, software | ||
| * distributed under the License is distributed on an "AS IS" BASIS, | ||
| * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| * See the License for the specific language governing permissions and | ||
| * limitations under the License. | ||
| */ | ||
| package com.google.idea.blaze.android.cppimpl.debug; | ||
|
|
||
| import com.android.tools.ndk.run.editor.NativeAndroidDebuggerState; | ||
| import com.google.common.collect.ImmutableList; | ||
| import com.google.idea.blaze.base.model.primitives.WorkspaceRoot; | ||
| import com.intellij.openapi.project.Project; | ||
| import org.jetbrains.annotations.NotNull; | ||
|
|
||
| /** Maps source directory when attaching to a process */ | ||
| public class BlazeNativeDebuggerStateSourceMapping { | ||
| public static void addSourceMapping( | ||
| @NotNull Project project, @NotNull NativeAndroidDebuggerState state) { | ||
| // Source code is always relative to the workspace root in a blaze project. | ||
| String workingDirPath = WorkspaceRoot.fromProject(project).directory().getPath(); | ||
| state.setWorkingDir(workingDirPath); | ||
|
|
||
| // Remote built binaries may use /proc/self/cwd to represent the working directory | ||
| // so we manually map /proc/self/cwd to the workspace root. We used to use | ||
| // `plugin.symbol-file.dwarf.comp-dir-symlink-paths = "/proc/self/cwd"` | ||
| // to automatically resolve this but it's no longer supported in newer versions of | ||
| // LLDB. | ||
| String sourceMapToWorkspaceRootCommand = | ||
| "settings append target.source-map /proc/self/cwd " + workingDirPath; | ||
| ImmutableList<String> startupCommands = | ||
| ImmutableList.<String>builder() | ||
| .addAll(state.getUserStartupCommands()) | ||
| .add(sourceMapToWorkspaceRootCommand) | ||
| .build(); | ||
| state.setUserStartupCommands(startupCommands); | ||
| } | ||
| } |
64 changes: 64 additions & 0 deletions
64
...pat/as232/com/google/idea/blaze/android/resources/BlazeLightResourceClassServiceBase.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,64 @@ | ||
| /* | ||
| * Copyright 2016 The Bazel Authors. All rights reserved. | ||
| * | ||
| * Licensed under the Apache License, Version 2.0 (the "License"); | ||
| * you may not use this file except in compliance with the License. | ||
| * You may obtain a copy of the License at | ||
| * | ||
| * http://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, software | ||
| * distributed under the License is distributed on an "AS IS" BASIS, | ||
| * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| * See the License for the specific language governing permissions and | ||
| * limitations under the License. | ||
| */ | ||
| package com.google.idea.blaze.android.resources; | ||
|
|
||
| import com.android.tools.idea.projectsystem.LightResourceClassService; | ||
| import com.google.common.annotations.VisibleForTesting; | ||
| import com.google.common.collect.ImmutableSet; | ||
| import com.google.common.collect.Maps; | ||
| import com.google.common.collect.Sets; | ||
| import com.google.idea.blaze.base.sync.data.BlazeDataStorage; | ||
| import com.google.idea.common.experiments.FeatureRolloutExperiment; | ||
| import com.intellij.openapi.module.Module; | ||
| import com.intellij.psi.PsiClass; | ||
| import java.util.Collection; | ||
| import java.util.Map; | ||
| import java.util.Set; | ||
|
|
||
| /** Implementation of {@link LightResourceClassService} set up at Blaze sync time. */ | ||
| public abstract class BlazeLightResourceClassServiceBase implements LightResourceClassService { | ||
|
|
||
| @VisibleForTesting | ||
| public static final FeatureRolloutExperiment workspaceResourcesFeature = | ||
| new FeatureRolloutExperiment("aswb.workspace.light.class.enabled"); | ||
|
|
||
| Map<String, BlazeRClass> rClasses = Maps.newHashMap(); | ||
| Map<Module, BlazeRClass> rClassesByModule = Maps.newHashMap(); | ||
| final Set<BlazeRClass> allRClasses = Sets.newHashSet(); | ||
|
|
||
| @Override | ||
| public Collection<? extends PsiClass> getLightRClassesAccessibleFromModule(Module module) { | ||
| if (workspaceResourcesFeature.isEnabled() | ||
| && module.getName().equals(BlazeDataStorage.WORKSPACE_MODULE_NAME)) { | ||
| // Returns all the packages in resource modules, and all the workspace packages that | ||
| // have previously been asked for. All `res/` directories in our project should belong to a | ||
| // resource module. For java sources, IntelliJ will ask for explicit resource package by | ||
| // calling `getLightRClasses` at which point we can create the package. This is not completely | ||
| // correct and the autocomplete will be slightly off when initial `R` is typed in the editor, | ||
| // but this workaround is being used to mitigate issues (b/136685602) while resources | ||
| // are re-worked. | ||
| return allRClasses; | ||
| } else { | ||
| return rClasses.values(); | ||
| } | ||
| } | ||
|
|
||
| @Override | ||
| public Collection<? extends PsiClass> getLightRClassesDefinedByModule(Module module) { | ||
| BlazeRClass rClass = rClassesByModule.get(module); | ||
| return rClass == null ? ImmutableSet.of() : ImmutableSet.of(rClass); | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.