From 464cc509ab8a301efeb397ca2024ffc493f57080 Mon Sep 17 00:00:00 2001 From: Brian Wilkerson Date: Mon, 22 Mar 2021 14:09:23 +0000 Subject: [PATCH] Remove one move ignore comment from generated LSP support Change-Id: I905056f98780f127466caa0ba9e8a5f6d13a7282 Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/192285 Reviewed-by: Danny Tuppeny Commit-Queue: Brian Wilkerson --- .../lib/lsp_protocol/protocol_custom_generated.dart | 4 +--- pkg/analysis_server/lib/lsp_protocol/protocol_generated.dart | 4 +--- pkg/analysis_server/tool/lsp_spec/codegen_dart.dart | 2 +- pkg/analysis_server/tool/lsp_spec/generate_all.dart | 4 +--- 4 files changed, 4 insertions(+), 10 deletions(-) diff --git a/pkg/analysis_server/lib/lsp_protocol/protocol_custom_generated.dart b/pkg/analysis_server/lib/lsp_protocol/protocol_custom_generated.dart index c56e6e99aaf..beaf3f53bdb 100644 --- a/pkg/analysis_server/lib/lsp_protocol/protocol_custom_generated.dart +++ b/pkg/analysis_server/lib/lsp_protocol/protocol_custom_generated.dart @@ -8,7 +8,6 @@ // ignore_for_file: annotate_overrides // ignore_for_file: unnecessary_parenthesis -// ignore_for_file: unused_shown_name import 'dart:core' hide deprecated; import 'dart:core' as core show deprecated; @@ -16,8 +15,7 @@ import 'dart:convert' show JsonEncoder; import 'package:analysis_server/lsp_protocol/protocol_generated.dart'; import 'package:analysis_server/lsp_protocol/protocol_special.dart'; import 'package:analysis_server/src/lsp/json_parsing.dart'; -import 'package:analysis_server/src/protocol/protocol_internal.dart' - show listEqual, mapEqual; +import 'package:analysis_server/src/protocol/protocol_internal.dart'; import 'package:analyzer/src/generated/utilities_general.dart'; import 'package:meta/meta.dart'; diff --git a/pkg/analysis_server/lib/lsp_protocol/protocol_generated.dart b/pkg/analysis_server/lib/lsp_protocol/protocol_generated.dart index 6559e10215f..03bb36c66ba 100644 --- a/pkg/analysis_server/lib/lsp_protocol/protocol_generated.dart +++ b/pkg/analysis_server/lib/lsp_protocol/protocol_generated.dart @@ -8,7 +8,6 @@ // ignore_for_file: annotate_overrides // ignore_for_file: unnecessary_parenthesis -// ignore_for_file: unused_shown_name import 'dart:core' hide deprecated; import 'dart:core' as core show deprecated; @@ -16,8 +15,7 @@ import 'dart:convert' show JsonEncoder; import 'package:analysis_server/lsp_protocol/protocol_custom_generated.dart'; import 'package:analysis_server/lsp_protocol/protocol_special.dart'; import 'package:analysis_server/src/lsp/json_parsing.dart'; -import 'package:analysis_server/src/protocol/protocol_internal.dart' - show listEqual, mapEqual; +import 'package:analysis_server/src/protocol/protocol_internal.dart'; import 'package:analyzer/src/generated/utilities_general.dart'; import 'package:meta/meta.dart'; diff --git a/pkg/analysis_server/tool/lsp_spec/codegen_dart.dart b/pkg/analysis_server/tool/lsp_spec/codegen_dart.dart index 083695956c3..d697810ac08 100644 --- a/pkg/analysis_server/tool/lsp_spec/codegen_dart.dart +++ b/pkg/analysis_server/tool/lsp_spec/codegen_dart.dart @@ -385,7 +385,7 @@ void _writeEnumClass(IndentableStringBuffer buffer, Namespace namespace) { ..outdent() ..writeIndentedln('}'); namespace.members.whereType().forEach((cons) { - // We don't use any deprecated enum values, so ommit them entirely. + // We don't use any deprecated enum values, so omit them entirely. if (cons.isDeprecated) { return; } diff --git a/pkg/analysis_server/tool/lsp_spec/generate_all.dart b/pkg/analysis_server/tool/lsp_spec/generate_all.dart index 3475f3ad86a..a45cba03207 100644 --- a/pkg/analysis_server/tool/lsp_spec/generate_all.dart +++ b/pkg/analysis_server/tool/lsp_spec/generate_all.dart @@ -161,7 +161,6 @@ String generatedFileHeader(int year, {bool importCustom = false}) => ''' // ignore_for_file: annotate_overrides // ignore_for_file: unnecessary_parenthesis -// ignore_for_file: unused_shown_name import 'dart:core' hide deprecated; import 'dart:core' as core show deprecated; @@ -169,8 +168,7 @@ import 'dart:convert' show JsonEncoder; import 'package:analysis_server/lsp_protocol/protocol${importCustom ? '_custom' : ''}_generated.dart'; import 'package:analysis_server/lsp_protocol/protocol_special.dart'; import 'package:analysis_server/src/lsp/json_parsing.dart'; -import 'package:analysis_server/src/protocol/protocol_internal.dart' - show listEqual, mapEqual; +import 'package:analysis_server/src/protocol/protocol_internal.dart'; import 'package:analyzer/src/generated/utilities_general.dart'; import 'package:meta/meta.dart';