| Index: pkg/analysis_server/tool/spec/codegen_inttest_methods.dart
|
| diff --git a/pkg/analysis_server/tool/spec/codegen_inttest_methods.dart b/pkg/analysis_server/tool/spec/codegen_inttest_methods.dart
|
| index 5819e20ca4ac456967e93d73b1cd24d6eee2a7ec..b34cca3a199d06c0e1b685c4c783cdab557f9861 100644
|
| --- a/pkg/analysis_server/tool/spec/codegen_inttest_methods.dart
|
| +++ b/pkg/analysis_server/tool/spec/codegen_inttest_methods.dart
|
| @@ -225,7 +225,7 @@ class CodegenInttestMethodsVisitor extends DartCodegenVisitor
|
| doCapitalize: true);
|
| futureClass = 'Future<$resultClass>';
|
| }
|
| - writeln('$futureClass $methodName(${args.join(', ')}) {');
|
| + writeln('$futureClass $methodName(${args.join(', ')}) async {');
|
| indent(() {
|
| String requestClass = camelJoin(
|
| [request.domainName, request.method, 'params'],
|
| @@ -245,24 +245,19 @@ class CodegenInttestMethodsVisitor extends DartCodegenVisitor
|
| args.addAll(optionalArgs);
|
| writeln('var params = new $requestClass(${args.join(', ')}).toJson();');
|
| }
|
| - writeln(
|
| - 'return server.send(${JSON.encode(request.longMethod)}, $paramsVar)');
|
| - indent(() {
|
| - writeln(' .then((result) {');
|
| - if (request.result != null) {
|
| - String kind = 'null';
|
| - if (requestClass == 'EditGetRefactoringParams') {
|
| - kind = 'kind';
|
| - }
|
| - writeln('ResponseDecoder decoder = new ResponseDecoder($kind);');
|
| - writeln(
|
| - "return new $resultClass.fromJson(decoder, 'result', result);");
|
| - } else {
|
| - writeln('expect(result, isNull);');
|
| - writeln('return null;');
|
| + String methodJson = JSON.encode(request.longMethod);
|
| + writeln('var result = await server.send($methodJson, $paramsVar);');
|
| + if (request.result != null) {
|
| + String kind = 'null';
|
| + if (requestClass == 'EditGetRefactoringParams') {
|
| + kind = 'kind';
|
| }
|
| - });
|
| - writeln('});');
|
| + writeln('ResponseDecoder decoder = new ResponseDecoder($kind);');
|
| + writeln("return new $resultClass.fromJson(decoder, 'result', result);");
|
| + } else {
|
| + writeln('expect(result, isNull);');
|
| + writeln('return null;');
|
| + }
|
| });
|
| writeln('}');
|
| }
|
|
|