-
Notifications
You must be signed in to change notification settings - Fork 312
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
fix(qsync): External modules navigation in starlark files
Co-authored-by: Błażej Kardyś <blazej.kardys@jetbrains.com>
- Loading branch information
1 parent
1578ce8
commit 412de37
Showing
20 changed files
with
311 additions
and
60 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
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
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
35 changes: 35 additions & 0 deletions
35
base/src/com/google/idea/blaze/base/model/ExternalWorkspaceDataManager.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,35 @@ | ||
| /* | ||
| * Copyright 2024 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.base.model; | ||
|
|
||
| import com.intellij.openapi.project.Project; | ||
|
|
||
|
|
||
| public class ExternalWorkspaceDataManager { | ||
| private ExternalWorkspaceData data; | ||
|
|
||
| public static ExternalWorkspaceDataManager getInstance(Project project) { | ||
| return project.getService(ExternalWorkspaceDataManager.class); | ||
| } | ||
|
|
||
| public ExternalWorkspaceData getData(){ | ||
| return data; | ||
| } | ||
|
|
||
| public void setData(ExternalWorkspaceData data) { | ||
| this.data = data; | ||
| } | ||
| } |
122 changes: 122 additions & 0 deletions
122
base/src/com/google/idea/blaze/base/model/ExternalWorkspaceSyncListener.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,122 @@ | ||
| /* | ||
| * 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.base.model; | ||
|
|
||
| import com.google.common.collect.ImmutableSet; | ||
| import com.google.common.util.concurrent.ListenableFuture; | ||
| import com.google.idea.blaze.base.bazel.BuildSystem; | ||
| import com.google.idea.blaze.base.command.info.BlazeInfo; | ||
| import com.google.idea.blaze.base.projectview.ProjectViewSet; | ||
| import com.google.idea.blaze.base.scope.BlazeContext; | ||
| import com.google.idea.blaze.base.settings.Blaze; | ||
| import com.google.idea.blaze.base.settings.BlazeImportSettings; | ||
| import com.google.idea.blaze.base.sync.SyncListener; | ||
| import com.google.idea.blaze.base.sync.SyncMode; | ||
| import com.google.idea.blaze.base.sync.SyncResult; | ||
| import com.google.idea.blaze.base.sync.SyncScope; | ||
| import com.intellij.openapi.project.Project; | ||
|
|
||
| import com.google.idea.blaze.base.async.FutureUtil; | ||
| import com.google.idea.blaze.base.async.FutureUtil.FutureResult; | ||
| import com.google.idea.blaze.base.command.BlazeCommandName; | ||
| import com.google.idea.blaze.base.command.BlazeFlags; | ||
| import com.google.idea.blaze.base.command.BlazeInvocationContext; | ||
| import com.google.idea.blaze.base.execution.ExecutionDeniedException; | ||
| import com.google.idea.blaze.base.projectview.ProjectViewManager; | ||
| import com.google.idea.blaze.base.scope.scopes.TimingScope.EventType; | ||
| import com.google.idea.blaze.base.sync.SyncScope.SyncCanceledException; | ||
| import com.google.idea.blaze.base.sync.SyncScope.SyncFailedException; | ||
| import com.google.idea.blaze.exception.BuildException; | ||
|
|
||
| import java.util.List; | ||
|
|
||
| public class ExternalWorkspaceSyncListener implements SyncListener { | ||
| @Override | ||
| public void onSyncComplete(Project project, BlazeContext context, BlazeImportSettings importSettings, ProjectViewSet projectViewSet, ImmutableSet<Integer> buildIds, BlazeProjectData blazeProjectData, SyncMode syncMode, SyncResult syncResult) { | ||
| if(Blaze.getProjectType(project) != BlazeImportSettings.ProjectType.QUERY_SYNC) { | ||
| return; | ||
| } | ||
|
|
||
| if(syncMode != SyncMode.STARTUP && syncMode != SyncMode.FULL){ | ||
| return ; | ||
| } | ||
|
|
||
| ProjectViewSet projectView = ProjectViewManager.getInstance(project).getProjectViewSet(); | ||
| BuildSystem.BuildInvoker invoker = | ||
| Blaze.getBuildSystemProvider(project).getBuildSystem().getBuildInvoker(project, context); | ||
| try { | ||
| var data = getExternalWorkspaceData( | ||
| project, | ||
| context, | ||
| projectView, | ||
| blazeProjectData.getBlazeVersionData(), | ||
| invoker.getBlazeInfo(), | ||
| syncMode | ||
| ); | ||
| ExternalWorkspaceDataManager.getInstance(project).setData(data); | ||
| } catch (SyncCanceledException | SyncFailedException e) { | ||
| throw new RuntimeException(e); | ||
| } | ||
|
|
||
| } | ||
|
|
||
|
|
||
|
|
||
| private ExternalWorkspaceData getExternalWorkspaceData( | ||
| Project project, | ||
| BlazeContext context, | ||
| ProjectViewSet projectViewSet, | ||
| BlazeVersionData blazeVersionData, | ||
| BlazeInfo blazeInfo, | ||
| SyncMode syncMode) | ||
| throws SyncScope.SyncCanceledException, SyncScope.SyncFailedException { | ||
|
|
||
| List<String> blazeModFlags = | ||
| BlazeFlags.blazeFlags( | ||
| project, | ||
| projectViewSet, | ||
| BlazeCommandName.MOD, | ||
| context, | ||
| BlazeInvocationContext.SYNC_CONTEXT); | ||
|
|
||
| ListenableFuture<ExternalWorkspaceData> externalWorkspaceDataFuture = | ||
| ExternalWorkspaceDataProvider.getInstance(project) | ||
| .getExternalWorkspaceData(context, blazeModFlags, blazeVersionData, blazeInfo); | ||
|
|
||
| FutureResult<ExternalWorkspaceData> externalWorkspaceDataResult = | ||
| FutureUtil.waitForFuture(context, externalWorkspaceDataFuture) | ||
| .timed(Blaze.buildSystemName(project) + "Mod", EventType.BlazeInvocation) | ||
| .withProgressMessage("Resolving module repository mapping...") | ||
| .onError(String.format("Could not run %s mod dump_repo_mapping", Blaze.buildSystemName(project))) | ||
| .run(); | ||
|
|
||
| ExternalWorkspaceData externalWorkspaceData = externalWorkspaceDataResult.result(); | ||
| if (externalWorkspaceData == null) { | ||
| Exception exception = externalWorkspaceDataResult.exception(); | ||
| if (exception != null) { | ||
| Throwable cause = exception.getCause(); | ||
| if (cause instanceof BuildException | ||
| && cause.getCause() instanceof ExecutionDeniedException) { | ||
| throw new SyncCanceledException(); | ||
| } | ||
| } | ||
| throw new SyncFailedException(); | ||
| } | ||
|
|
||
| return externalWorkspaceData; | ||
| } | ||
|
|
||
| } |
38 changes: 38 additions & 0 deletions
38
base/src/com/google/idea/blaze/base/qsync/BazelInfoHandler.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,38 @@ | ||
| /* | ||
| * Copyright 2024 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.base.qsync; | ||
|
|
||
| import com.google.idea.blaze.base.bazel.BuildSystem; | ||
| import com.google.idea.blaze.base.command.info.BlazeInfo; | ||
| import com.google.idea.blaze.base.sync.SyncScope; | ||
| import com.google.idea.blaze.exception.BuildException; | ||
|
|
||
| public class BazelInfoHandler { | ||
| private final BuildSystem.BuildInvoker buildInvoker; | ||
|
|
||
| BazelInfoHandler(BuildSystem.BuildInvoker buildInvoker) { | ||
| this.buildInvoker = buildInvoker; | ||
| } | ||
|
|
||
| BlazeInfo getBazelInfo() throws BuildException { | ||
| try { | ||
| return buildInvoker.getBlazeInfo(); | ||
| } catch (SyncScope.SyncFailedException e) { | ||
| throw new BuildException(e); | ||
| } | ||
| } | ||
| } |
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
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
Oops, something went wrong.