chore(clean up): inline AspectSyncProjectData

[LeFrosch]

Next step of finally phasing out any querysync specific implementations. We removed the querysync specific implementation of the BlazeProjectData interface, thus this PR inlines the AspectSyncProject and converts it to an AutoValue.

This removes friction for future changes to the BlazeProjectData.

[gemini-code-assist]

Summary of Changes

Hello @LeFrosch, I'm Gemini Code Assist¹! I'm currently reviewing this pull request and will post my feedback shortly. In the meantime, here's a summary to help you and other reviewers quickly get up to speed!

This pull request significantly refactors the core project data handling by inlining AspectSyncProjectData into BlazeProjectData and converting the latter into an AutoValue class. This modernization simplifies the API for accessing project data, making the codebase cleaner and more maintainable. The changes are part of a broader effort to remove querysync-specific logic, paving the way for easier future development and reducing technical debt.

Highlights

• Refactoring BlazeProjectData: The AspectSyncProjectData class has been removed and its core functionality has been merged directly into the BlazeProjectData interface, which is now an AutoValue abstract class. This change simplifies the project data model by consolidating related data structures.
• API Modernization: Across the codebase, calls to getter methods like blazeProjectData.getSomeField() have been updated to use the more concise blazeProjectData.someField() or blazeProjectData.someField().someOtherMethod() style, aligning with the AutoValue pattern.
• Removal of QuerySync Specifics: This change is a step towards phasing out querysync-specific implementations, as indicated by the removal of the isQuerySync() method from BlazeProjectData and the general streamlining of the project data structure.

Changelog

• base/src/com/google/idea/blaze/base/actions/BuildFileUtils.java
  • Updated blazeProjectData.getWorkspacePathResolver() to blazeProjectData.workspacePathResolver().
• base/src/com/google/idea/blaze/base/actions/FileGitHubIssueAction.java
  • Updated projectData.getBlazeVersionData() to projectData.blazeVersionData().
• base/src/com/google/idea/blaze/base/actions/debug/BazelDumpVFS.kt
  • Updated data.blazeInfo.executionRoot to data.blazeInfo().executionRoot.
• base/src/com/google/idea/blaze/base/actions/debug/BazelShowTargetInfo.kt
  • Updated data.targetMap.targets() to data.targetMap().targets().
• base/src/com/google/idea/blaze/base/build/BlazeBuildService.java
  • Replaced getWorkspacePathResolver() with workspacePathResolver().
  • Replaced getWorkspaceLanguageSettings() with workspaceLanguageSettings().
  • Replaced getBlazeVersionData() with blazeVersionData().
• base/src/com/google/idea/blaze/base/dependencies/AddSourceToProjectHelper.java
  • Updated context.syncData.getTargetMap() to context.syncData.targetMap().
• base/src/com/google/idea/blaze/base/dependencies/DependencyFinder.java
  • Updated projectData.getTargetMap() to projectData.targetMap().
• base/src/com/google/idea/blaze/base/ide/OpenBlazeWorkspaceFileAction.java
  • Updated blazeProjectData.getWorkspacePathResolver() to blazeProjectData.workspacePathResolver().
• base/src/com/google/idea/blaze/base/lang/LegacyAdditionalLanguagesHelper.java
  • Updated projectData.getWorkspaceLanguageSettings() to projectData.workspaceLanguageSettings().
• base/src/com/google/idea/blaze/base/lang/buildfile/language/semantics/BuildLanguageSpecProviderImpl.java
  • Updated blazeProjectData.getSyncState() to blazeProjectData.syncState().
• base/src/com/google/idea/blaze/base/lang/buildfile/references/ExternalWorkspaceReferenceFragment.java
  • Updated blazeProjectData.getExternalWorkspaceData() to blazeProjectData.externalWorkspaceData().
• base/src/com/google/idea/blaze/base/lang/projectview/completion/AdditionalLanguagesCompletionContributor.java
  • Updated projectData.getWorkspaceLanguageSettings() to projectData.workspaceLanguageSettings().
• base/src/com/google/idea/blaze/base/model/AspectSyncProjectData.java
  • Removed file as its functionality was inlined into BlazeProjectData.
• base/src/com/google/idea/blaze/base/model/BlazeProjectData.java
  • Converted from an interface to an AutoValue abstract class.
  • Added abstract methods for targetData(), blazeInfo(), blazeVersionData(), workspacePathResolver(), artifactLocationDecoder(), workspaceLanguageSettings(), externalWorkspaceData(), and syncState().
  • Implemented fromProto(), parseTargetData(), toProto(), getTargetInfo(), buildTarget(), targets(), targetMap(), remoteOutputs(), loadFromDisk(), and saveToDisk() methods.
  • Removed the isQuerySync() method.
• base/src/com/google/idea/blaze/base/model/RemoteOutputArtifacts.java
  • Updated projectData.getRemoteOutputs() to projectData.remoteOutputs().
• base/src/com/google/idea/blaze/base/projectview/ProjectViewManagerImpl.java
  • Updated projectData.getWorkspacePathResolver() to projectData.workspacePathResolver().
• base/src/com/google/idea/blaze/base/run/BlazeRunConfigurationSyncListener.java
  • Updated blazeProjectData.getWorkspacePathResolver() to blazeProjectData.workspacePathResolver().
• base/src/com/google/idea/blaze/base/run/TestTargetSourcesHeuristic.java
  • Updated projectData.getArtifactLocationDecoder() to projectData.artifactLocationDecoder().
• base/src/com/google/idea/blaze/base/run/filter/StandardFileResolver.java
  • Updated projectData.getWorkspacePathResolver() to projectData.workspacePathResolver().
• base/src/com/google/idea/blaze/base/run/producers/PendingWebTestContext.java
  • Updated projectData.getTargetMap() to projectData.targetMap().
• base/src/com/google/idea/blaze/base/run/smrunner/BlazeWebTestLocator.java
  • Updated projectData.getTargetMap() to projectData.targetMap().
• base/src/com/google/idea/blaze/base/run/smrunner/BlazeXmlToTestEventsConverter.java
  • Updated projectData.getBlazeVersionData() to projectData.blazeVersionData().
• base/src/com/google/idea/blaze/base/run/targetfinder/ProjectTargetFinder.java
  • Updated projectData.getBuildTarget() to projectData.buildTarget().
• base/src/com/google/idea/blaze/base/run/testmap/ProjectSourceToTargetFinder.java
  • Updated projectData.getArtifactLocationDecoder() to projectData.artifactLocationDecoder().
  • Updated projectData.getTargetMap() to projectData.targetMap().
• base/src/com/google/idea/blaze/base/run/ui/TargetExpressionListUi.java
  • Updated projectData.getTargetMap() to projectData.targetMap().
• base/src/com/google/idea/blaze/base/settings/ui/AddDirectoryToProjectAction.java
  • Updated projectData.getWorkspacePathResolver() to projectData.workspacePathResolver().
• base/src/com/google/idea/blaze/base/sync/BlazeSyncManager.java
  • Updated oldProjectData.getWorkspaceLanguageSettings() to oldProjectData.workspaceLanguageSettings().
• base/src/com/google/idea/blaze/base/sync/ProjectUpdateSyncTask.java
  • Removed import of AspectSyncProjectData.
  • Changed return type and cast of getOldProjectData from AspectSyncProjectData to BlazeProjectData.
  • Updated oldProjectData.getSyncState() to oldProjectData.syncState().
  • Changed instantiation of newProjectData to use BlazeProjectData.builder().
  • Updated blazeProjectData.getBlazeInfo().getExecutionRoot() to blazeProjectData.blazeInfo().getExecutionRoot().
  • Updated newBlazeProjectData.getWorkspaceLanguageSettings() to newBlazeProjectData.workspaceLanguageSettings().
• base/src/com/google/idea/blaze/base/sync/SyncPhaseCoordinator.java
  • Removed import of AspectSyncProjectData.
  • Changed return type and cast of getOldProjectData from AspectSyncProjectData to BlazeProjectData.
  • Updated oldProjectData.getTargetData() to oldProjectData.targetData().
  • Updated oldProjectData.getBlazeInfo() to oldProjectData.blazeInfo().
  • Updated projectData.getTargetMap() to projectData.targetMap().
• base/src/com/google/idea/blaze/base/sync/actions/CleanProjectTargetsSyncAction.java
  • Updated projectData.getTargetMap() to projectData.targetMap().
• base/src/com/google/idea/blaze/base/sync/aspects/BlazeIdeInterface.java
  • Updated import and parameter types from AspectSyncProjectData to BlazeProjectData.
• base/src/com/google/idea/blaze/base/sync/aspects/BlazeIdeInterfaceAspectsImpl.java
  • Updated import and parameter types from AspectSyncProjectData to BlazeProjectData.
  • Updated oldProjectData.getTargetMap() to oldProjectData.targetMap().
  • Updated oldProjectData.getTargetData() to oldProjectData.targetData().
• base/src/com/google/idea/blaze/base/sync/aspects/storage/AspectStorageService.kt
  • Updated projectData.workspaceLanguageSettings to projectData.workspaceLanguageSettings().
  • Updated projectData.externalWorkspaceData to projectData.externalWorkspaceData().
  • Updated projectData.workspacePathResolver to projectData.workspacePathResolver().
  • Updated projectData.blazeInfo to projectData.blazeInfo().
• base/src/com/google/idea/blaze/base/sync/autosync/BuildFileAutoSyncProvider.java
  • Updated projectData.getWorkspacePathResolver() to projectData.workspacePathResolver().
• base/src/com/google/idea/blaze/base/sync/autosync/ProjectTargetManagerImpl.java
  • Updated projectData.getTargetMap() to projectData.targetMap().
• base/src/com/google/idea/blaze/base/sync/data/AspectSyncProjectDataManager.java
  • Removed import of AspectSyncProjectData.
  • Changed projectData field type from AspectSyncProjectData to BlazeProjectData.
  • Updated AspectSyncProjectData.loadFromDisk() to BlazeProjectData.loadFromDisk().
  • Changed cast type for projectData in saveProject.
  • Updated projectData.getBlazeVersionData() to projectData.blazeVersionData().
• base/src/com/google/idea/blaze/base/sync/workspace/ExecutionRootPathResolver.java
  • Updated projectData.getBlazeInfo() to projectData.blazeInfo().
  • Updated projectData.getWorkspacePathResolver() to projectData.workspacePathResolver().
  • Updated projectData.getTargetMap() to projectData.targetMap().
• base/src/com/google/idea/blaze/base/sync/workspace/WorkspaceHelper.java
  • Updated projectData.getBlazeInfo() to projectData.blazeInfo().
  • Updated blazeProjectData.getExternalWorkspaceData() to blazeProjectData.externalWorkspaceData().
• base/src/com/google/idea/blaze/base/sync/workspace/WorkspacePathResolverProviderImpl.java
  • Updated projectData.getWorkspacePathResolver() to projectData.workspacePathResolver().
• base/src/com/google/idea/blaze/base/targetmaps/AspectSyncSourceToTargetMap.java
  • Updated blazeProjectData.getTargetMap() to blazeProjectData.targetMap().
  • Updated blazeProjectData.getArtifactLocationDecoder() to blazeProjectData.artifactLocationDecoder().
• base/src/com/google/idea/blaze/base/targetmaps/ReverseDependencyMap.java
  • Updated projectData.getTargetMap() to projectData.targetMap().
• base/src/com/google/idea/blaze/base/targetmaps/TransitiveDependencyMap.java
  • Updated blazeProjectData.getTargetMap() to blazeProjectData.targetMap().
• base/tests/utils/integration/com/google/idea/blaze/base/ExternalWorkspaceFixture.java
  • Updated blazeProjectData.getBlazeInfo() to blazeProjectData.blazeInfo().
• base/tests/utils/unit/com/google/idea/blaze/base/bazel/BuildSystemProviderWrapper.java
  • Updated comment to reflect blazeInfo() method name.
• base/tests/utils/unit/com/google/idea/blaze/base/model/MockBlazeProjectDataBuilder.java
  • Updated build() method to use BlazeProjectData.builder() for instantiation.
• clwb/src/com/google/idea/blaze/clwb/radler/RadSyncStatusContributor.kt
  • Updated projectData.getWorkspaceLanguageSettings() to projectData.workspaceLanguageSettings().
• clwb/src/com/google/idea/blaze/clwb/run/BlazeCidrLauncher.java
  • Updated projectData.getTargetMap() to projectData.targetMap().
  • Updated projectData.getBlazeInfo() to projectData.blazeInfo().
• clwb/src/com/google/idea/blaze/clwb/run/BlazeCidrTestOutputFilter.java
  • Updated data.getWorkspacePathResolver() to data.workspacePathResolver().
• clwb/src/com/google/idea/blaze/clwb/run/BlazeGDBDriverConfiguration.java
  • Updated blazeProjectData.getWorkspacePathResolver() to blazeProjectData.workspacePathResolver().
• clwb/src/com/google/idea/blaze/clwb/sync/BlazeCLionSyncPlugin.java
  • Updated projectData.getWorkspaceLanguageSettings() to projectData.workspaceLanguageSettings().
• cpp/src/com/google/idea/blaze/cpp/BlazeCSyncPlugin.java
  • Updated blazeProjectData.getWorkspaceLanguageSettings() to blazeProjectData.workspaceLanguageSettings().
• cpp/src/com/google/idea/blaze/cpp/BlazeCWorkspace.java
  • Updated blazeProjectData.getTargetMap() to blazeProjectData.targetMap().
  • Updated blazeProjectData.getBlazeInfo() to blazeProjectData.blazeInfo().
• cpp/src/com/google/idea/blaze/cpp/BlazeConfigurationResolver.java
  • Updated blazeProjectData.getTargetMap() to blazeProjectData.targetMap().
  • Updated blazeProjectData.getWorkspacePathResolver() to blazeProjectData.workspacePathResolver().
• cpp/src/com/google/idea/blaze/cpp/BlazeResolveConfiguration.kt
  • Updated blazeProjectData.targetMap to blazeProjectData.targetMap().
  • Updated blazeProjectData.artifactLocationDecoder to blazeProjectData.artifactLocationDecoder().
• cpp/src/com/google/idea/blaze/cpp/CPrefetchFileSource.java
  • Updated blazeProjectData.getWorkspaceLanguageSettings() to blazeProjectData.workspaceLanguageSettings().
  • Updated blazeProjectData.getArtifactLocationDecoder() to blazeProjectData.artifactLocationDecoder().
  • Updated blazeProjectData.getTargetMap() to blazeProjectData.targetMap().
• cpp/src/com/google/idea/blaze/cpp/HeaderRootTrimmerImpl.kt
  • Updated projectData.targetMap.targets() to projectData.targetMap().targets().
  • Updated projectData.blazeInfo to projectData.blazeInfo().
• cpp/src/com/google/idea/blaze/cpp/XcodeCompilerSettingsProviderImpl.java
  • Updated projectData.getBlazeVersionData() to projectData.blazeVersionData().
• cpp/src/com/google/idea/blaze/cpp/oclang/BlazeCustomHeaderProvider.java
  • Updated data.getWorkspacePathResolver() to data.workspacePathResolver().
• cpp/src/com/google/idea/blaze/cpp/oclang/CppSyncStatusContributor.java
  • Updated projectData.getWorkspaceLanguageSettings() to projectData.workspaceLanguageSettings().
• cpp/src/com/google/idea/blaze/cpp/sync/HeaderCacheService.kt
  • Updated projectData.targetMap.map() to projectData.targetMap().map().
  • Updated projectData.artifactLocationDecoder to projectData.artifactLocationDecoder().
• dart/src/com/google/idea/blaze/dart/BlazeDartSyncPlugin.java
  • Updated blazeProjectData.getWorkspaceLanguageSettings() to blazeProjectData.workspaceLanguageSettings().
• dart/src/com/google/idea/blaze/dart/DartPrefetchFileSource.java
  • Updated blazeProjectData.getWorkspaceLanguageSettings() to blazeProjectData.workspaceLanguageSettings().
  • Updated blazeProjectData.getArtifactLocationDecoder() to blazeProjectData.artifactLocationDecoder().
  • Updated blazeProjectData.getTargetMap() to blazeProjectData.targetMap().
• javascript/src/com/google/idea/blaze/javascript/BlazeJavascriptAdditionalLibraryRootsProvider.java
  • Updated projectData.getWorkspaceLanguageSettings() to projectData.workspaceLanguageSettings().
  • Updated projectData.getArtifactLocationDecoder() to projectData.artifactLocationDecoder().
  • Updated projectData.getTargetMap() to projectData.targetMap().
• javascript/src/com/google/idea/blaze/javascript/BlazeJavascriptSyncPlugin.java
  • Updated projectData.getWorkspaceLanguageSettings() to projectData.workspaceLanguageSettings().
  • Updated blazeProjectData.getWorkspaceLanguageSettings() to blazeProjectData.workspaceLanguageSettings().
• javascript/src/com/google/idea/blaze/javascript/run/producers/BlazeJavaScriptTestRunLineMarkerContributor.java
  • Updated projectData.getTargetMap() to projectData.targetMap().
• javascript/src/com/google/idea/blaze/javascript/run/producers/NonBlazeProducerSuppressor.java
  • Updated projectData.getWorkspaceLanguageSettings() to projectData.workspaceLanguageSettings().
• javascript/src/com/google/idea/blaze/javascript/run/smrunner/BlazeJavascriptTestLocator.java
  • Updated projectData.getTargetMap() to projectData.targetMap().
  • Updated projectData.getArtifactLocationDecoder() to projectData.artifactLocationDecoder().
• javascript/src/com/google/idea/blaze/typescript/AddTsConfigNotificationProvider.java
  • Updated projectData.getWorkspaceLanguageSettings() to projectData.workspaceLanguageSettings().
• javascript/src/com/google/idea/blaze/typescript/BlazeTypeScriptAdditionalLibraryRootsProvider.java
  • Updated projectData.getWorkspaceLanguageSettings() to projectData.workspaceLanguageSettings().
  • Updated projectData.getArtifactLocationDecoder() to projectData.artifactLocationDecoder().
  • Updated projectData.getTargetMap() to projectData.targetMap().
• javascript/src/com/google/idea/blaze/typescript/BlazeTypescriptGotoDeclarationHandler.java
  • Updated projectData.getWorkspaceLanguageSettings() to projectData.workspaceLanguageSettings().
• javascript/src/com/google/idea/blaze/typescript/BlazeTypescriptSyncPlugin.java
  • Updated blazeProjectData.getWorkspaceLanguageSettings() to blazeProjectData.workspaceLanguageSettings().
• python/src/com/google/idea/blaze/python/resolve/BlazePyResolverUtils.java
  • Updated projectData.getBlazeInfo() to projectData.blazeInfo().
  • Updated projectData.getWorkspacePathResolver() to projectData.workspacePathResolver().
• python/src/com/google/idea/blaze/python/resolve/provider/AbstractPyImportResolverStrategy.java
  • Updated projectData.getArtifactLocationDecoder() to projectData.artifactLocationDecoder().
  • Updated projectData.getTargetMap() to projectData.targetMap().
  • Updated projectData.getWorkspacePathResolver() to projectData.workspacePathResolver().
• python/src/com/google/idea/blaze/python/run/BlazePyRunConfigurationRunner.java
  • Updated projectData.getTargetMap() to projectData.targetMap().
• python/src/com/google/idea/blaze/python/sync/AlwaysPresentPythonSyncPlugin.java
  • Updated blazeProjectData.getTargetMap() to blazeProjectData.targetMap().
• python/src/com/google/idea/blaze/python/sync/BlazePythonSyncPlugin.java
  • Updated projectData.getWorkspaceLanguageSettings() to projectData.workspaceLanguageSettings().
  • Updated blazeProjectData.getTargetMap() to blazeProjectData.targetMap().
• python/src/com/google/idea/blaze/python/sync/PySyncStatusContributor.java
  • Updated projectData.getWorkspaceLanguageSettings() to projectData.workspaceLanguageSettings().
• python/src/com/google/idea/blaze/python/sync/PythonPrefetchFileSource.java
  • Updated blazeProjectData.getWorkspaceLanguageSettings() to blazeProjectData.workspaceLanguageSettings().
  • Updated blazeProjectData.getArtifactLocationDecoder() to blazeProjectData.artifactLocationDecoder().
  • Updated blazeProjectData.getTargetMap() to blazeProjectData.targetMap().
• python/tests/integrationtests/com/google/idea/blaze/python/resolve/provider/BazelPyGenfilesImportResolverStrategyTest.java
  • Updated BlazeProjectDataManager.getInstance(getProject()).getBlazeProjectData().getBlazeInfo() to blazeInfo().
• python/tests/unittests/com/google/idea/blaze/python/resolve/provider/AbstractPyImportResolverStrategyTest.java
  • Updated projectData.getWorkspacePathResolver() to projectData.workspacePathResolver().
  • Updated projectData.getTargetMap() to projectData.targetMap().
  • Updated projectData.getArtifactLocationDecoder() to projectData.artifactLocationDecoder().
• skylark/src/com/google/idea/blaze/skylark/debugger/SkylarkDebuggingUtils.java
  • Updated projectData.getBlazeVersionData() to projectData.blazeVersionData().

Using Gemini Code Assist

The full guide for Gemini Code Assist can be found on our documentation page, here are some quick tips.

Invoking Gemini

You can request assistance from Gemini at any point by creating a comment using either /gemini <command> or @gemini-code-assist <command>. Below is a summary of the supported commands on the current page.

Feature	Command	Description
Code Review	/gemini review	Performs a code review for the current pull request in its current state.
Pull Request Summary	/gemini summary	Provides a summary of the current pull request in its current state.
Comment	@gemini-code-assist	Responds in comments when explicitly tagged, both in pull request comments and review comments.
Help	/gemini help	Displays a list of available commands.

Customization

To customize Gemini Code Assist for GitHub experience, repository maintainers can create a configuration file and/or provide a custom code review style guide (such as PEP-8 for Python) by creating and adding files to a .gemini/ folder in the base of the repository. Detailed instructions can be found here.

Limitations & Feedback

Gemini Code Assist may make mistakes. Please leave feedback on any instances where its feedback is incorrect or counter productive. You can react with 👍 and 👎 on @gemini-code-assist comments. If you're interested in giving your feedback about your experience with Gemini Code Assist for Github and other Google products, sign up here.

You can also get AI-powered code generation, chat, as well as code reviews directly in the IDE at no cost with the Gemini Code Assist IDE Extension.

Footnotes

1. Review the Privacy Notices, Generative AI Prohibited Use Policy, Terms of Service, and learn how to configure Gemini Code Assist in GitHub here. Gemini can make mistakes, so double check it and use code with caution. ↩

[gemini-code-assist]

Code Review

This pull request is a nice cleanup that inlines AspectSyncProjectData into BlazeProjectData and converts it to an @AutoValue class. This is a good step towards phasing out query-sync specific implementations and should reduce friction for future changes. The refactoring is extensive but mostly mechanical, and the changes look correct. I've found a few minor opportunities for cleanup where redundant casts and checks were left over from the refactoring.