Remove type merging and the only instance that used it

Change-Id: I7b1f18073e4d204d0d92b531369888ec8f1f3dfb
Reviewed-on: https://dart-review.googlesource.com/c/79685
Reviewed-by: Brian Wilkerson <brianwilkerson@google.com>
Commit-Queue: Danny Tuppeny <dantup@google.com>

Author: DanTup

pkg/analysis_server/lib/lsp_protocol/protocol_generated.dart

@@ -1044,21 +1044,6 @@ class Hover {
   final Range range;
 }
 
-class InitializeError {
-  InitializeError(this.retry);
-
-  /// If the protocol version provided by the client can't be handled by the
-  /// server. @deprecated This initialize error got replaced by client
-  /// capabilities. There is no version handshake in version 3.0x
-  static const unknownProtocolVersion = 1;
-
-  /// Indicates whether the client execute the following retry logic: (1) show
-  /// the message provided by the ResponseError to the user (2) user selects
-  /// retry or cancel (3) if user selected retry the initialize method is sent
-  /// again.
-  final bool retry;
-}
-
 class InitializeParams {
   InitializeParams(this.capabilities, this.initializationOptions,
       this.processId, this.rootPath, this.rootUri, this.workspaceFolders);

pkg/analysis_server/test/tool/lsp_spec/typescript_test.dart

@@ -184,24 +184,6 @@ export namespace ResourceOperationKind {
           equals('Supports deleting existing files and folders.'));
     });
 
-    test('folds a namespace of constants into an interface', () {
-      final String input = '''
-export interface Thing {
-}
-export namespace Thing {
-	export const b: String = 'string';
-}
-    ''';
-      final List<ApiItem> output = extractTypes(input);
-      expect(output, hasLength(1));
-      expect(output[0], const TypeMatcher<Interface>());
-      final Interface interface = output[0];
-      expect(interface.members, hasLength(1));
-      expect(interface.members[0], const TypeMatcher<Const>());
-      final Const b = interface.members[0];
-      expect(b.name, equals('b'));
-    });
-
     test('sorts types and members', () {
       final String input = '''
 export interface b {

pkg/analysis_server/tool/lsp_spec/typescript.dart

@@ -14,8 +14,17 @@ List<ApiItem> extractAllTypes(List<String> code) {
 
 List<ApiItem> extractTypes(String code) {
   final types = ApiItem.extractFrom(code);
+  _removeUnwantedTypes(types);
   _sort(types);
-  return _mergeTypes(types);
+  return types;
+}
+
+/// Removes types that are in the spec that we don't want.
+void _removeUnwantedTypes(List<ApiItem> types) {
+  // These types are not used for v3.0 (Feb 2017) and by dropping them we don't
+  // have to handle any cases where both a namespace and interfaces are declared
+  // with the same name.
+  types.removeWhere((item) => item.name == 'InitializeError');
 }
 
 String _cleanComment(String comment) {
@@ -38,27 +47,6 @@ String _cleanComment(String comment) {
   return comment.trim();
 }
 
-/// The LSP contains Interfaces and Namespaces (of constants) with the
-/// same name. This step merges them together into one so that the output
-/// code does not contain two definitions.
-List<ApiItem> _mergeTypes(List<ApiItem> items) {
-  final interfaces = <String, Interface>{};
-  for (var interface in items.whereType<Interface>()) {
-    interfaces[interface.name] = interface;
-  }
-  for (var namespace in items.whereType<Namespace>()) {
-    final matchedInterface = interfaces[namespace.name];
-    if (matchedInterface != null) {
-      matchedInterface.members.addAll(namespace.members);
-    }
-  }
-  // Return the list minus any interfaces that would've been merged above.
-  return items
-      .where((item) =>
-          item is Namespace ? !interfaces.containsKey(item.name) : true)
-      .toList();
-}
-
 List<String> _parseTypes(String baseTypes, String sep) {
   // Special case for a single complicated type we can't parse easily...
   if (baseTypes ==