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

[analysis_server] Trigger reanalysis when LSP TODO settings change

Browse source 
Previously the setting only applied to future analysis, but this triggers reanalysis immediately.

Change-Id: Ia5687e2bbf5f5a48d9659645c5b15976e712f44f
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/263800
Reviewed-by: Brian Wilkerson <brianwilkerson@google.com>
Commit-Queue: Brian Wilkerson <brianwilkerson@google.com>
This commit is contained in:
Danny Tuppeny 2022-10-12 17:43:01 +00:00 committed by Commit Queue
parent 10e7e478a2
commit 20af356c79
3 changed files with 37 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
pkg/analysis_server/lib/src/lsp/client_configuration.dart
View file

@ -38,11 +38,24 @@ class LspClientConfiguration {
/// Returns the global configuration for the whole workspace.
LspGlobalClientConfiguration get global => _globalSettings;
/// Returns whether or not the provided new configuration changes any values
/// that would affect analysis results.
bool affectsAnalysisResults(LspGlobalClientConfiguration otherConfig) {
// Check whether TODO settings have changed.
final oldFlag = _globalSettings.showAllTodos;
final newFlag = otherConfig.showAllTodos;
final oldTypes = _globalSettings.showTodoTypes;
final newTypes = otherConfig.showTodoTypes;
return newFlag != oldFlag ||
!const SetEquality().equals(oldTypes, newTypes);
}
/// Returns whether or not the provided new configuration changes any values
/// that would require analysis roots to be updated.
bool affectsAnalysisRoots(LspGlobalClientConfiguration otherConfig) {
return _globalSettings.analysisExcludedFolders !=
otherConfig.analysisExcludedFolders;
final oldExclusions = _globalSettings.analysisExcludedFolders;
final newExclusions = otherConfig.analysisExcludedFolders;
return !const ListEquality().equals(oldExclusions, newExclusions);
}
/// Returns config for a given resource.

5
pkg/analysis_server/lib/src/lsp/lsp_analysis_server.dart
View file

@ -272,6 +272,11 @@ class LspAnalysisServer extends AnalysisServer {
if (clientConfiguration.affectsAnalysisRoots(oldGlobalConfig)) {
await _refreshAnalysisRoots();
} else if (clientConfiguration
.affectsAnalysisResults(oldGlobalConfig)) {
// Some settings affect analysis results and require re-analysis
// (such as showTodos).
await reanalyze();
}
}
}

22
pkg/analysis_server/test/lsp/diagnostic_test.dart
View file

@ -531,12 +531,24 @@ analyzer:
// Ensure initial analysis completely finished before we continue.
await initialAnalysis;
// Enable showTodos and update the file to ensure TODOs now come through.
final secondDiagnosticsUpdate = waitForDiagnostics(mainFileUri);
// Capture any diagnostic updates. We might get multiple, because during
// a reanalyze, all diagnostics are flushed (to empty) and then analysis
// occurs.
List<Diagnostic>? latestDiagnostics;
notificationsFromServer
.where((notification) =>
notification.method == Method.textDocument_publishDiagnostics)
.map((notification) => PublishDiagnosticsParams.fromJson(
notification.params as Map<String, Object?>))
.where((diagnostics) => diagnostics.uri == mainFileUri)
.listen((diagnostics) {
latestDiagnostics = diagnostics.diagnostics;
});
final nextAnalysis = waitForAnalysisComplete();
await updateConfig({'showTodos': true});
await replaceFile(222, mainFileUri, contents);
final updatedDiagnostics = await secondDiagnosticsUpdate;
expect(updatedDiagnostics, hasLength(1));
await nextAnalysis;
expect(latestDiagnostics, hasLength(1));
}
Future<void> test_todos_specific() async {