[third_party/pkg] put package:dap and package:language_server_protoco…

…l under analysis Change-Id: Ie1a48956055fa0f4ebcd85e5d2b762021fc074d7 Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/370101 Commit-Queue: Devon Carew <[email protected]> Reviewed-by: Sam Rawlins <[email protected]>
dart-lang · Jun 7, 2024 · cb64e64 · cb64e64
1 parent d533382
commit cb64e64
Show file tree

Hide file tree

Showing 12 changed files with 30 additions and 11 deletions.
diff --git a/pkg/analysis_server/lib/src/lsp/handlers/custom/handler_diagnostic_server.dart b/pkg/analysis_server/lib/src/lsp/handlers/custom/handler_diagnostic_server.dart
@@ -15,7 +15,7 @@ class DiagnosticServerHandler
   Method get handlesMessage => CustomMethods.diagnosticServer;
 
   @override
-  LspJsonHandler<void> get jsonHandler => NullJsonHandler;
+  LspJsonHandler<void> get jsonHandler => nullJsonHandler;
 
   @override
   Future<ErrorOr<DartDiagnosticServer>> handle(

diff --git a/pkg/analysis_server/lib/src/lsp/handlers/custom/handler_reanalyze.dart b/pkg/analysis_server/lib/src/lsp/handlers/custom/handler_reanalyze.dart
@@ -16,7 +16,7 @@ class ReanalyzeHandler extends LspMessageHandler<void, void> {
   Method get handlesMessage => CustomMethods.reanalyze;
 
   @override
-  LspJsonHandler<void> get jsonHandler => NullJsonHandler;
+  LspJsonHandler<void> get jsonHandler => nullJsonHandler;
 
   @override
   Future<ErrorOr<void>> handle(

diff --git a/pkg/analysis_server/lib/src/lsp/handlers/handler_exit.dart b/pkg/analysis_server/lib/src/lsp/handlers/handler_exit.dart
@@ -21,7 +21,7 @@ class ExitMessageHandler extends LspMessageHandler<void, void> {
   Method get handlesMessage => Method.exit;
 
   @override
-  LspJsonHandler<void> get jsonHandler => NullJsonHandler;
+  LspJsonHandler<void> get jsonHandler => nullJsonHandler;
 
   @override
   Future<ErrorOr<void>> handle(

diff --git a/pkg/analysis_server/lib/src/lsp/handlers/handler_reject.dart b/pkg/analysis_server/lib/src/lsp/handlers/handler_reject.dart
@@ -18,7 +18,7 @@ class RejectMessageHandler extends SharedMessageHandler<Object?, void> {
       super.server, this.handlesMessage, this.errorCode, this.errorMessage);
 
   @override
-  LspJsonHandler<void> get jsonHandler => NullJsonHandler;
+  LspJsonHandler<void> get jsonHandler => nullJsonHandler;
 
   @override
   ErrorOr<void> handle(

diff --git a/pkg/analysis_server/lib/src/lsp/handlers/handler_shutdown.dart b/pkg/analysis_server/lib/src/lsp/handlers/handler_shutdown.dart
@@ -14,7 +14,7 @@ class ShutdownMessageHandler extends LspMessageHandler<void, void> {
   Method get handlesMessage => Method.shutdown;
 
   @override
-  LspJsonHandler<void> get jsonHandler => NullJsonHandler;
+  LspJsonHandler<void> get jsonHandler => nullJsonHandler;
 
   @override
   ErrorOr<void> handle(

diff --git a/pkg/analysis_server/tool/lsp_spec/generate_all.dart b/pkg/analysis_server/tool/lsp_spec/generate_all.dart
@@ -110,6 +110,8 @@ $licenseComment
 // To regenerate the file, use the script
 // "pkg/analysis_server/tool/lsp_spec/generate_all.dart".
 
+// ignore_for_file: constant_identifier_names
+
 import 'dart:convert' show JsonEncoder;
 
 import 'package:collection/collection.dart';

diff --git a/third_party/pkg/dap/pubspec.yaml b/third_party/pkg/dap/pubspec.yaml
@@ -16,4 +16,5 @@ dev_dependencies:
   args: any
   collection: any
   http: any
+  lints: any
   path: any
diff --git a/third_party/pkg/language_server_protocol/lib/protocol_custom_generated.dart b/third_party/pkg/language_server_protocol/lib/protocol_custom_generated.dart
@@ -24,6 +24,8 @@
 // To regenerate the file, use the script
 // "pkg/analysis_server/tool/lsp_spec/generate_all.dart".
 
+// ignore_for_file: constant_identifier_names
+
 import 'dart:convert' show JsonEncoder;
 
 import 'package:collection/collection.dart';

diff --git a/third_party/pkg/language_server_protocol/lib/protocol_generated.dart b/third_party/pkg/language_server_protocol/lib/protocol_generated.dart
@@ -24,6 +24,8 @@
 // To regenerate the file, use the script
 // "pkg/analysis_server/tool/lsp_spec/generate_all.dart".
 
+// ignore_for_file: constant_identifier_names
+
 import 'dart:convert' show JsonEncoder;
 
 import 'package:collection/collection.dart';

diff --git a/third_party/pkg/language_server_protocol/lib/protocol_special.dart b/third_party/pkg/language_server_protocol/lib/protocol_special.dart
@@ -9,7 +9,7 @@ import 'package:language_server_protocol/protocol_generated.dart';
 
 const jsonRpcVersion = '2.0';
 
-const NullJsonHandler = LspJsonHandler<void>(_alwaysTrue, _alwaysNull);
+const nullJsonHandler = LspJsonHandler<void>(_alwaysTrue, _alwaysNull);
 
 /// Returns if two objects are equal, recursively checking items in
 /// Maps/Lists.

diff --git a/third_party/pkg/language_server_protocol/pubspec.yaml b/third_party/pkg/language_server_protocol/pubspec.yaml
@@ -1,16 +1,17 @@
 name: language_server_protocol
-version: 0.0.0
 description: >-
   A Dart implementation of the language server protocol.
 repository: https://github.com/dart-lang/sdk/tree/main/third_party/pkg/language_server_protocol
+
 publish_to: none
 
 environment:
   sdk: '>=3.0.0 <4.0.0'
 
+# Use 'any' constraints here; we get our versions from the DEPS file.
 dependencies:
-  collection: 'any'
+  collection: any
 
-dependency_overrides:
-  collection:
-    path: ../collection
+# Use 'any' constraints here; we get our versions from the DEPS file.
+dev_dependencies:
+  lints: any
diff --git a/tools/bots/test_matrix.json b/tools/bots/test_matrix.json
@@ -2958,6 +2958,17 @@
             "pkg/pkg/dartdev/test/native_assets"
           ]
         },
+        {
+          "name": "analyze third_party/pkg authored packages",
+          "script": "${build_root}/dart-sdk/bin/dart",
+          "arguments": [
+            "analyze",
+            "--suppress-analytics",
+            "--fatal-infos",
+            "third_party/pkg/dap",
+            "third_party/pkg/language_server_protocol"
+          ]
+        },
         {
           "name": "pub integration tests",
           "script": "tools/bots/pub_integration_test.py",