remove the use of the analysis server --enable-experiments flag from flutter analyze (#69966)
This commit is contained in:
parent
e18533e7ab
commit
5ba2d79ad2
@ -30,7 +30,6 @@ class AnalyzeCommand extends FlutterCommand {
|
|||||||
_logger = logger,
|
_logger = logger,
|
||||||
_terminal = terminal,
|
_terminal = terminal,
|
||||||
_platform = platform {
|
_platform = platform {
|
||||||
addEnableExperimentation(hide: !verboseHelp);
|
|
||||||
argParser.addFlag('flutter-repo',
|
argParser.addFlag('flutter-repo',
|
||||||
negatable: false,
|
negatable: false,
|
||||||
help: 'Include all the examples and tests from the Flutter repository.',
|
help: 'Include all the examples and tests from the Flutter repository.',
|
||||||
@ -126,7 +125,6 @@ class AnalyzeCommand extends FlutterCommand {
|
|||||||
platform: _platform,
|
platform: _platform,
|
||||||
processManager: _processManager,
|
processManager: _processManager,
|
||||||
terminal: _terminal,
|
terminal: _terminal,
|
||||||
experiments: stringsArg('enable-experiment'),
|
|
||||||
artifacts: _artifacts,
|
artifacts: _artifacts,
|
||||||
).analyze();
|
).analyze();
|
||||||
} else {
|
} else {
|
||||||
@ -140,7 +138,6 @@ class AnalyzeCommand extends FlutterCommand {
|
|||||||
platform: _platform,
|
platform: _platform,
|
||||||
processManager: _processManager,
|
processManager: _processManager,
|
||||||
terminal: _terminal,
|
terminal: _terminal,
|
||||||
experiments: stringsArg('enable-experiment'),
|
|
||||||
artifacts: _artifacts,
|
artifacts: _artifacts,
|
||||||
).analyze();
|
).analyze();
|
||||||
}
|
}
|
||||||
|
@ -28,7 +28,6 @@ abstract class AnalyzeBase {
|
|||||||
@required this.platform,
|
@required this.platform,
|
||||||
@required this.processManager,
|
@required this.processManager,
|
||||||
@required this.terminal,
|
@required this.terminal,
|
||||||
@required this.experiments,
|
|
||||||
@required this.artifacts,
|
@required this.artifacts,
|
||||||
});
|
});
|
||||||
|
|
||||||
@ -49,8 +48,6 @@ abstract class AnalyzeBase {
|
|||||||
@protected
|
@protected
|
||||||
final Terminal terminal;
|
final Terminal terminal;
|
||||||
@protected
|
@protected
|
||||||
final List<String> experiments;
|
|
||||||
@protected
|
|
||||||
final Artifacts artifacts;
|
final Artifacts artifacts;
|
||||||
|
|
||||||
/// Called by [AnalyzeCommand] to start the analysis process.
|
/// Called by [AnalyzeCommand] to start the analysis process.
|
||||||
|
@ -26,7 +26,6 @@ class AnalyzeContinuously extends AnalyzeBase {
|
|||||||
@required Terminal terminal,
|
@required Terminal terminal,
|
||||||
@required Platform platform,
|
@required Platform platform,
|
||||||
@required ProcessManager processManager,
|
@required ProcessManager processManager,
|
||||||
@required List<String> experiments,
|
|
||||||
@required Artifacts artifacts,
|
@required Artifacts artifacts,
|
||||||
}) : super(
|
}) : super(
|
||||||
argResults,
|
argResults,
|
||||||
@ -37,7 +36,6 @@ class AnalyzeContinuously extends AnalyzeBase {
|
|||||||
platform: platform,
|
platform: platform,
|
||||||
terminal: terminal,
|
terminal: terminal,
|
||||||
processManager: processManager,
|
processManager: processManager,
|
||||||
experiments: experiments,
|
|
||||||
artifacts: artifacts,
|
artifacts: artifacts,
|
||||||
);
|
);
|
||||||
|
|
||||||
@ -77,7 +75,6 @@ class AnalyzeContinuously extends AnalyzeBase {
|
|||||||
platform: platform,
|
platform: platform,
|
||||||
processManager: processManager,
|
processManager: processManager,
|
||||||
terminal: terminal,
|
terminal: terminal,
|
||||||
experiments: experiments,
|
|
||||||
);
|
);
|
||||||
server.onAnalyzing.listen((bool isAnalyzing) => _handleAnalysisStatus(server, isAnalyzing));
|
server.onAnalyzing.listen((bool isAnalyzing) => _handleAnalysisStatus(server, isAnalyzing));
|
||||||
server.onErrors.listen(_handleAnalysisErrors);
|
server.onErrors.listen(_handleAnalysisErrors);
|
||||||
|
@ -27,7 +27,6 @@ class AnalyzeOnce extends AnalyzeBase {
|
|||||||
@required Platform platform,
|
@required Platform platform,
|
||||||
@required ProcessManager processManager,
|
@required ProcessManager processManager,
|
||||||
@required Terminal terminal,
|
@required Terminal terminal,
|
||||||
@required List<String> experiments,
|
|
||||||
@required Artifacts artifacts,
|
@required Artifacts artifacts,
|
||||||
this.workingDirectory,
|
this.workingDirectory,
|
||||||
}) : super(
|
}) : super(
|
||||||
@ -39,7 +38,6 @@ class AnalyzeOnce extends AnalyzeBase {
|
|||||||
platform: platform,
|
platform: platform,
|
||||||
processManager: processManager,
|
processManager: processManager,
|
||||||
terminal: terminal,
|
terminal: terminal,
|
||||||
experiments: experiments,
|
|
||||||
artifacts: artifacts,
|
artifacts: artifacts,
|
||||||
);
|
);
|
||||||
|
|
||||||
@ -95,7 +93,6 @@ class AnalyzeOnce extends AnalyzeBase {
|
|||||||
logger: logger,
|
logger: logger,
|
||||||
processManager: processManager,
|
processManager: processManager,
|
||||||
terminal: terminal,
|
terminal: terminal,
|
||||||
experiments: experiments,
|
|
||||||
);
|
);
|
||||||
|
|
||||||
Stopwatch timer;
|
Stopwatch timer;
|
||||||
|
@ -27,13 +27,11 @@ class AnalysisServer {
|
|||||||
@required Logger logger,
|
@required Logger logger,
|
||||||
@required Platform platform,
|
@required Platform platform,
|
||||||
@required Terminal terminal,
|
@required Terminal terminal,
|
||||||
@required List<String> experiments,
|
|
||||||
}) : _fileSystem = fileSystem,
|
}) : _fileSystem = fileSystem,
|
||||||
_processManager = processManager,
|
_processManager = processManager,
|
||||||
_logger = logger,
|
_logger = logger,
|
||||||
_platform = platform,
|
_platform = platform,
|
||||||
_terminal = terminal,
|
_terminal = terminal;
|
||||||
_experiments = experiments;
|
|
||||||
|
|
||||||
final String sdkPath;
|
final String sdkPath;
|
||||||
final List<String> directories;
|
final List<String> directories;
|
||||||
@ -42,7 +40,6 @@ class AnalysisServer {
|
|||||||
final Logger _logger;
|
final Logger _logger;
|
||||||
final Platform _platform;
|
final Platform _platform;
|
||||||
final Terminal _terminal;
|
final Terminal _terminal;
|
||||||
final List<String> _experiments;
|
|
||||||
|
|
||||||
Process _process;
|
Process _process;
|
||||||
final StreamController<bool> _analyzingController =
|
final StreamController<bool> _analyzingController =
|
||||||
@ -64,11 +61,6 @@ class AnalysisServer {
|
|||||||
_fileSystem.path.join(sdkPath, 'bin', 'dart'),
|
_fileSystem.path.join(sdkPath, 'bin', 'dart'),
|
||||||
'--disable-dart-dev',
|
'--disable-dart-dev',
|
||||||
snapshot,
|
snapshot,
|
||||||
for (String experiment in _experiments)
|
|
||||||
...<String>[
|
|
||||||
'--enable-experiment',
|
|
||||||
experiment,
|
|
||||||
],
|
|
||||||
'--disable-server-feature-completion',
|
'--disable-server-feature-completion',
|
||||||
'--disable-server-feature-search',
|
'--disable-server-feature-search',
|
||||||
'--sdk',
|
'--sdk',
|
||||||
|
@ -93,7 +93,6 @@ void main() {
|
|||||||
processManager: processManager,
|
processManager: processManager,
|
||||||
logger: logger,
|
logger: logger,
|
||||||
terminal: terminal,
|
terminal: terminal,
|
||||||
experiments: <String>[],
|
|
||||||
);
|
);
|
||||||
|
|
||||||
int errorCount = 0;
|
int errorCount = 0;
|
||||||
@ -132,7 +131,6 @@ void main() {
|
|||||||
processManager: processManager,
|
processManager: processManager,
|
||||||
logger: logger,
|
logger: logger,
|
||||||
terminal: terminal,
|
terminal: terminal,
|
||||||
experiments: <String>[],
|
|
||||||
);
|
);
|
||||||
|
|
||||||
int errorCount = 0;
|
int errorCount = 0;
|
||||||
@ -158,7 +156,6 @@ void main() {
|
|||||||
processManager: processManager,
|
processManager: processManager,
|
||||||
logger: logger,
|
logger: logger,
|
||||||
terminal: terminal,
|
terminal: terminal,
|
||||||
experiments: <String>[],
|
|
||||||
);
|
);
|
||||||
|
|
||||||
int errorCount = 0;
|
int errorCount = 0;
|
||||||
@ -171,42 +168,6 @@ void main() {
|
|||||||
expect(errorCount, 0);
|
expect(errorCount, 0);
|
||||||
});
|
});
|
||||||
|
|
||||||
testWithoutContext('Can forward null-safety experiments to the AnalysisServer', () async {
|
|
||||||
final Completer<void> completer = Completer<void>();
|
|
||||||
final StreamController<List<int>> stdin = StreamController<List<int>>();
|
|
||||||
const String fakeSdkPath = 'dart-sdk';
|
|
||||||
final FakeCommand fakeCommand = FakeCommand(
|
|
||||||
command: const <String>[
|
|
||||||
'dart-sdk/bin/dart',
|
|
||||||
'--disable-dart-dev',
|
|
||||||
'dart-sdk/bin/snapshots/analysis_server.dart.snapshot',
|
|
||||||
'--enable-experiment',
|
|
||||||
'non-nullable',
|
|
||||||
'--disable-server-feature-completion',
|
|
||||||
'--disable-server-feature-search',
|
|
||||||
'--sdk',
|
|
||||||
'dart-sdk',
|
|
||||||
],
|
|
||||||
completer: completer,
|
|
||||||
stdin: IOSink(stdin.sink),
|
|
||||||
);
|
|
||||||
|
|
||||||
server = AnalysisServer(fakeSdkPath, <String>[''],
|
|
||||||
fileSystem: MemoryFileSystem.test(),
|
|
||||||
platform: FakePlatform(),
|
|
||||||
processManager: FakeProcessManager.list(<FakeCommand>[
|
|
||||||
fakeCommand,
|
|
||||||
]),
|
|
||||||
logger: BufferLogger.test(),
|
|
||||||
terminal: Terminal.test(),
|
|
||||||
experiments: <String>[
|
|
||||||
'non-nullable'
|
|
||||||
],
|
|
||||||
);
|
|
||||||
|
|
||||||
await server.start();
|
|
||||||
});
|
|
||||||
|
|
||||||
testUsingContext('Can run AnalysisService with customized cache location', () async {
|
testUsingContext('Can run AnalysisService with customized cache location', () async {
|
||||||
final Completer<void> completer = Completer<void>();
|
final Completer<void> completer = Completer<void>();
|
||||||
final StreamController<List<int>> stdin = StreamController<List<int>>();
|
final StreamController<List<int>> stdin = StreamController<List<int>>();
|
||||||
|
Loading…
x
Reference in New Issue
Block a user