Support for 'double' fields in protocol.

scheglov · scheglov · commit ad6b1ebbd645 · 2019-07-09T18:09:47.000Z
R=brianwilkerson@google.com Change-Id: If8dacd4578e01380f4d9e4ce1f809b9485bffc7f Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/108462 Reviewed-by: Brian Wilkerson <brianwilkerson@google.com>
diff --git a/pkg/analysis_server/test/integration/support/integration_tests.dart b/pkg/analysis_server/test/integration/support/integration_tests.dart
@@ -18,6 +18,8 @@ import 'protocol_matchers.dart';
 
 const Matcher isBool = const TypeMatcher<bool>();
 
+const Matcher isDouble = const TypeMatcher<double>();
+
 const Matcher isInt = const TypeMatcher<int>();
 
 const Matcher isNotification = const MatchesJsonObject(
diff --git a/pkg/analysis_server/tool/spec/codegen_dart_protocol.dart b/pkg/analysis_server/tool/spec/codegen_dart_protocol.dart
@@ -1042,6 +1042,8 @@ class CodegenProtocolVisitor extends DartCodegenVisitor with CodeGenerator {
             return new FromJsonFunction('jsonDecoder.decodeString');
           case 'bool':
             return new FromJsonFunction('jsonDecoder.decodeBool');
+          case 'double':
+            return new FromJsonFunction('jsonDecoder.decodeDouble');
           case 'int':
           case 'long':
             return new FromJsonFunction('jsonDecoder.decodeInt');
diff --git a/pkg/analysis_server/tool/spec/codegen_java.dart b/pkg/analysis_server/tool/spec/codegen_java.dart
@@ -50,6 +50,7 @@ class CodegenJavaVisitor extends HierarchicalApiVisitor with CodeGenerator {
    */
   static const Map<String, String> _typeRenames = const {
     'bool': 'boolean',
+    'double': 'double',
     'int': 'int',
     'AvailableSuggestionRelevanceTag': 'String',
     'ExecutionContextId': 'String',
@@ -126,7 +127,10 @@ class CodegenJavaVisitor extends HierarchicalApiVisitor with CodeGenerator {
   bool isPrimitive(TypeDecl type) {
     if (type is TypeReference) {
       String typeStr = javaType(type);
-      return typeStr == 'boolean' || typeStr == 'int' || typeStr == 'long';
+      return typeStr == 'boolean' ||
+          typeStr == 'double' ||
+          typeStr == 'int' ||
+          typeStr == 'long';
     }
     return false;
   }
@@ -167,6 +171,8 @@ class CodegenJavaVisitor extends HierarchicalApiVisitor with CodeGenerator {
         if (optional) {
           if (typeName == 'boolean') {
             typeName = 'Boolean';
+          } else if (typeName == 'double') {
+            typeName = 'Double';
           } else if (typeName == 'int') {
             typeName = 'Integer';
           }
diff --git a/pkg/analysis_server/tool/spec/codegen_java_types.dart b/pkg/analysis_server/tool/spec/codegen_java_types.dart
@@ -140,6 +140,8 @@ class CodegenJavaType extends CodegenJavaVisitor {
       return 'getAsString';
     } else if (name == 'boolean' || name == 'Boolean') {
       return 'getAsBoolean';
+    } else if (name == 'double' || name == 'Double') {
+      return 'getAsDouble';
     } else if (name == 'int' || name == 'Integer') {
       return 'getAsInt';
     } else if (name == 'long' || name == 'Long') {
diff --git a/pkg/analysis_server_client/lib/src/protocol/protocol_internal.dart b/pkg/analysis_server_client/lib/src/protocol/protocol_internal.dart
@@ -6,8 +6,8 @@ import 'dart:collection';
 import 'dart:convert' hide JsonDecoder;
 
 import 'package:analysis_server_client/src/protocol/protocol_base.dart';
-import 'package:analysis_server_client/src/protocol/protocol_generated.dart';
 import 'package:analysis_server_client/src/protocol/protocol_common.dart';
+import 'package:analysis_server_client/src/protocol/protocol_generated.dart';
 
 final Map<String, RefactoringKind> REQUEST_ID_REFACTORING_KINDS =
     new HashMap<String, RefactoringKind>();
@@ -276,6 +276,25 @@ abstract class JsonDecoder {
     throw mismatch(jsonPath, 'bool', json);
   }
 
+  /**
+   * Decode a JSON object that is expected to be a double.  A string
+   * representation of a double is also accepted.
+   */
+  double decodeDouble(String jsonPath, Object json) {
+    if (json is double) {
+      return json;
+    } else if (json is int) {
+      return json.toDouble();
+    } else if (json is String) {
+      double value = double.tryParse(json);
+      if (value == null) {
+        throw mismatch(jsonPath, 'double', json);
+      }
+      return value;
+    }
+    throw mismatch(jsonPath, 'double', json);
+  }
+
   /**
    * Decode a JSON object that is expected to be an integer.  A string
    * representation of an integer is also accepted.
diff --git a/pkg/analyzer_plugin/lib/src/protocol/protocol_internal.dart b/pkg/analyzer_plugin/lib/src/protocol/protocol_internal.dart
@@ -269,6 +269,25 @@ abstract class JsonDecoder {
     throw mismatch(jsonPath, 'bool', json);
   }
 
+  /**
+   * Decode a JSON object that is expected to be a double.  A string
+   * representation of a double is also accepted.
+   */
+  double decodeDouble(String jsonPath, Object json) {
+    if (json is double) {
+      return json;
+    } else if (json is int) {
+      return json.toDouble();
+    } else if (json is String) {
+      double value = double.tryParse(json);
+      if (value == null) {
+        throw mismatch(jsonPath, 'double', json);
+      }
+      return value;
+    }
+    throw mismatch(jsonPath, 'double', json);
+  }
+
   /**
    * Decode a JSON object that is expected to be an integer.  A string
    * representation of an integer is also accepted.
