From 4a7aad370f3ce4e26bb32fd9d2b29668ff5a9a99 Mon Sep 17 00:00:00 2001 From: Devon Carew Date: Thu, 12 Nov 2020 23:12:15 +0000 Subject: [PATCH] rename DartUnitHighlightsComputer2 to DartUnitHighlightsComputer Change-Id: I08f15cfbba260dddc1e87f0a91d823df04214e49 Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/171800 Reviewed-by: Brian Wilkerson Commit-Queue: Devon Carew --- pkg/analysis_server/lib/src/analysis_server.dart | 4 ++-- ...r_highlights2.dart => computer_highlights.dart} | 14 +++++++------- .../lib/src/operation/operation_analysis.dart | 4 ++-- ...ter_test.dart => highlights_computer_test.dart} | 4 ++-- .../test/src/computer/test_all.dart | 4 ++-- 5 files changed, 15 insertions(+), 15 deletions(-) rename pkg/analysis_server/lib/src/computer/{computer_highlights2.dart => computer_highlights.dart} (98%) rename pkg/analysis_server/test/src/computer/{highlights2_computer_test.dart => highlights_computer_test.dart} (97%) diff --git a/pkg/analysis_server/lib/src/analysis_server.dart b/pkg/analysis_server/lib/src/analysis_server.dart index 33f99b1701f..fb9d078d254 100644 --- a/pkg/analysis_server/lib/src/analysis_server.dart +++ b/pkg/analysis_server/lib/src/analysis_server.dart @@ -15,7 +15,7 @@ import 'package:analysis_server/protocol/protocol_generated.dart' hide AnalysisOptions; import 'package:analysis_server/src/analysis_server_abstract.dart'; import 'package:analysis_server/src/channel/channel.dart'; -import 'package:analysis_server/src/computer/computer_highlights2.dart'; +import 'package:analysis_server/src/computer/computer_highlights.dart'; import 'package:analysis_server/src/computer/new_notifications.dart'; import 'package:analysis_server/src/context_manager.dart'; import 'package:analysis_server/src/domain_analysis.dart'; @@ -825,7 +825,7 @@ class ServerContextManagerCallbacks extends ContextManagerCallbacks { } List _computeHighlightRegions(CompilationUnit unit) { - return DartUnitHighlightsComputer2(unit).compute(); + return DartUnitHighlightsComputer(unit).compute(); } server.AnalysisNavigationParams _computeNavigationParams( diff --git a/pkg/analysis_server/lib/src/computer/computer_highlights2.dart b/pkg/analysis_server/lib/src/computer/computer_highlights.dart similarity index 98% rename from pkg/analysis_server/lib/src/computer/computer_highlights2.dart rename to pkg/analysis_server/lib/src/computer/computer_highlights.dart index 70489fef447..df56229bda4 100644 --- a/pkg/analysis_server/lib/src/computer/computer_highlights2.dart +++ b/pkg/analysis_server/lib/src/computer/computer_highlights.dart @@ -10,16 +10,16 @@ import 'package:analyzer/src/dart/ast/extensions.dart'; import 'package:analyzer_plugin/protocol/protocol_common.dart' hide Element; /// A computer for [HighlightRegion]s in a Dart [CompilationUnit]. -class DartUnitHighlightsComputer2 { +class DartUnitHighlightsComputer { final CompilationUnit _unit; final List _regions = []; - DartUnitHighlightsComputer2(this._unit); + DartUnitHighlightsComputer(this._unit); /// Returns the computed highlight regions, not `null`. List compute() { - _unit.accept(_DartUnitHighlightsComputerVisitor2(this)); + _unit.accept(_DartUnitHighlightsComputerVisitor(this)); _addCommentRanges(); return _regions; } @@ -429,11 +429,11 @@ class DartUnitHighlightsComputer2 { } } -/// An AST visitor for [DartUnitHighlightsComputer2]. -class _DartUnitHighlightsComputerVisitor2 extends RecursiveAstVisitor { - final DartUnitHighlightsComputer2 computer; +/// An AST visitor for [DartUnitHighlightsComputer]. +class _DartUnitHighlightsComputerVisitor extends RecursiveAstVisitor { + final DartUnitHighlightsComputer computer; - _DartUnitHighlightsComputerVisitor2(this.computer); + _DartUnitHighlightsComputerVisitor(this.computer); @override void visitAnnotation(Annotation node) { diff --git a/pkg/analysis_server/lib/src/operation/operation_analysis.dart b/pkg/analysis_server/lib/src/operation/operation_analysis.dart index 1f2391e24d0..a53a0cfabe2 100644 --- a/pkg/analysis_server/lib/src/operation/operation_analysis.dart +++ b/pkg/analysis_server/lib/src/operation/operation_analysis.dart @@ -5,7 +5,7 @@ import 'package:analysis_server/src/analysis_server.dart'; import 'package:analysis_server/src/computer/computer_closingLabels.dart'; import 'package:analysis_server/src/computer/computer_folding.dart'; -import 'package:analysis_server/src/computer/computer_highlights2.dart'; +import 'package:analysis_server/src/computer/computer_highlights.dart'; import 'package:analysis_server/src/computer/computer_outline.dart'; import 'package:analysis_server/src/computer/computer_overrides.dart'; import 'package:analysis_server/src/domains/analysis/implemented_dart.dart'; @@ -99,7 +99,7 @@ void sendAnalysisNotificationFolding(AnalysisServer server, String file, void sendAnalysisNotificationHighlights( AnalysisServer server, String file, CompilationUnit dartUnit) { _sendNotification(server, () { - var regions = DartUnitHighlightsComputer2(dartUnit).compute(); + var regions = DartUnitHighlightsComputer(dartUnit).compute(); var params = protocol.AnalysisHighlightsParams(file, regions); server.sendNotification(params.toNotification()); }); diff --git a/pkg/analysis_server/test/src/computer/highlights2_computer_test.dart b/pkg/analysis_server/test/src/computer/highlights_computer_test.dart similarity index 97% rename from pkg/analysis_server/test/src/computer/highlights2_computer_test.dart rename to pkg/analysis_server/test/src/computer/highlights_computer_test.dart index 33aa1175758..d2519856f23 100644 --- a/pkg/analysis_server/test/src/computer/highlights2_computer_test.dart +++ b/pkg/analysis_server/test/src/computer/highlights_computer_test.dart @@ -2,7 +2,7 @@ // for details. All rights reserved. Use of this source code is governed by a // BSD-style license that can be found in the LICENSE file. -import 'package:analysis_server/src/computer/computer_highlights2.dart'; +import 'package:analysis_server/src/computer/computer_highlights.dart'; import 'package:analysis_server/src/protocol_server.dart'; import 'package:test/test.dart'; import 'package:test_reflective_loader/test_reflective_loader.dart'; @@ -103,7 +103,7 @@ void main() { expect(result.errors, isEmpty); } - var computer = DartUnitHighlightsComputer2(result.unit); + var computer = DartUnitHighlightsComputer(result.unit); highlights = computer.compute(); } } diff --git a/pkg/analysis_server/test/src/computer/test_all.dart b/pkg/analysis_server/test/src/computer/test_all.dart index b35ad77b371..1a04173341a 100644 --- a/pkg/analysis_server/test/src/computer/test_all.dart +++ b/pkg/analysis_server/test/src/computer/test_all.dart @@ -6,7 +6,7 @@ import 'package:test_reflective_loader/test_reflective_loader.dart'; import 'closing_labels_computer_test.dart' as closing_labels_computer; import 'folding_computer_test.dart' as folding_computer; -import 'highlights2_computer_test.dart' as highlights2_computer; +import 'highlights_computer_test.dart' as highlights_computer; import 'import_elements_computer_test.dart' as import_elements_computer; import 'imported_elements_computer_test.dart' as imported_elements_computer; import 'outline_computer_test.dart' as outline_computer; @@ -15,7 +15,7 @@ void main() { defineReflectiveSuite(() { closing_labels_computer.main(); folding_computer.main(); - highlights2_computer.main(); + highlights_computer.main(); import_elements_computer.main(); imported_elements_computer.main(); outline_computer.main();