languages/dart-sdk
languages/dart-sdk
1
0
Fork 0
mirror of https://github.com/dart-lang/sdk synced 2024-09-18 20:41:24 +00:00
Code Issues Packages Projects Releases Wiki Activity

Add 'provideLanguageVersion' option to BlazeWorkspace.

Browse source 
Bug: https://buganizer.corp.google.com/issues/279909837
Change-Id: I8e094899eae10323d9b2b608da0815442b82cf49
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/299860
Reviewed-by: Samuel Rawlins <srawlins@google.com>
Commit-Queue: Konstantin Shcheglov <scheglov@google.com>
This commit is contained in:
Konstantin Shcheglov 2023-04-28 19:59:12 +00:00 committed by Commit Queue
parent 8d0677eca5
commit 6af3a8dc2c
1 changed files with 22 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
pkg/analyzer/lib/src/workspace/blaze.dart
View file

@ -205,6 +205,14 @@ class BlazeWorkspace extends Workspace
/// to avoid this in cases when `BUILD` files are always available.
final bool _lookForBuildFileSubstitutes;
/// If `true`, the language version for packages will be provided.
///
/// If `false`, [BlazeWorkspacePackage.languageVersion] will return `null`,
/// so that [Packages] will be used to get the language versions.
///
/// See https://buganizer.corp.google.com/issues/279909837
final bool _provideLanguageVersion;
/// The language version for this workspace, `null` if cannot be read.
final Version? _languageVersion;
@ -220,8 +228,12 @@ class BlazeWorkspace extends Workspace
this.binPaths,
this.genfiles, {
required bool lookForBuildFileSubstitutes,
required bool provideLanguageVersion,
}) : _lookForBuildFileSubstitutes = lookForBuildFileSubstitutes,
_languageVersion = _readLanguageVersion(provider, root);
_provideLanguageVersion = provideLanguageVersion,
_languageVersion = provideLanguageVersion
? _readLanguageVersion(provider, root)
: null;
/// Stream of files that we tried to find along with their potential or actual
/// paths.
@ -430,6 +442,7 @@ class BlazeWorkspace extends Workspace
ResourceProvider provider,
String filePath, {
bool lookForBuildFileSubstitutes = true,
bool provideLanguageVersion = true,
}) {
var context = provider.pathContext;
var startFolder = provider.getFolder(filePath);
@ -444,7 +457,8 @@ class BlazeWorkspace extends Workspace
binPaths = binPaths..add(context.join(root, 'blaze-bin'));
return BlazeWorkspace._(
provider, root, binPaths, context.join(root, 'blaze-genfiles'),
lookForBuildFileSubstitutes: lookForBuildFileSubstitutes);
lookForBuildFileSubstitutes: lookForBuildFileSubstitutes,
provideLanguageVersion: provideLanguageVersion);
}
// Found the WORKSPACE file, must be a non-git workspace.
@ -454,7 +468,8 @@ class BlazeWorkspace extends Workspace
binPaths = binPaths..add(context.join(root, 'blaze-bin'));
return BlazeWorkspace._(
provider, root, binPaths, context.join(root, 'blaze-genfiles'),
lookForBuildFileSubstitutes: lookForBuildFileSubstitutes);
lookForBuildFileSubstitutes: lookForBuildFileSubstitutes,
provideLanguageVersion: provideLanguageVersion);
}
}
@ -477,7 +492,7 @@ class BlazeWorkspace extends Workspace
binPaths.add(blazeBin.path);
return BlazeWorkspace._(provider, root.path, binPaths, blazeGenfiles.path,
lookForBuildFileSubstitutes: true);
lookForBuildFileSubstitutes: true, provideLanguageVersion: true);
}
/// Find the "bin" folder path, by searching for it.
@ -568,6 +583,9 @@ class BlazeWorkspacePackage extends WorkspacePackage {
@override
Version? get languageVersion {
if (!workspace._provideLanguageVersion) {
return null;
}
_readBuildFile();
return _languageVersion ?? workspace._languageVersion;
}