Skip to content

Commit dd04535

Browse files
authored
Fix avoid_renaming_method_parameters linter warning. (#783)
1 parent 4b1fc34 commit dd04535

File tree

3 files changed

+18
-18
lines changed

3 files changed

+18
-18
lines changed

protoc_plugin/lib/src/service_generator.dart

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -154,15 +154,15 @@ class ServiceGenerator {
154154

155155
void _generateRequestMethod(IndentingWriter out) {
156156
out.addBlock(
157-
'$_generatedMessage createRequest($coreImportPrefix.String method) {',
157+
'$_generatedMessage createRequest($coreImportPrefix.String methodName) {',
158158
'}', () {
159-
out.addBlock('switch (method) {', '}', () {
159+
out.addBlock('switch (methodName) {', '}', () {
160160
for (var m in _methodDescriptors) {
161161
var inputClass = _getDartClassName(m.inputType);
162162
out.println("case '${m.name}': return $inputClass();");
163163
}
164164
out.println('default: '
165-
"throw $coreImportPrefix.ArgumentError('Unknown method: \$method');");
165+
"throw $coreImportPrefix.ArgumentError('Unknown method: \$methodName');");
166166
});
167167
});
168168
out.println();
@@ -171,17 +171,17 @@ class ServiceGenerator {
171171
void _generateDispatchMethod(IndentingWriter out) {
172172
out.addBlock(
173173
'$_future<$_generatedMessage> handleCall($_serverContext ctx, '
174-
'$coreImportPrefix.String method, $_generatedMessage request) {',
174+
'$coreImportPrefix.String methodName, $_generatedMessage request) {',
175175
'}', () {
176-
out.addBlock('switch (method) {', '}', () {
176+
out.addBlock('switch (methodName) {', '}', () {
177177
for (var m in _methodDescriptors) {
178178
var methodName = _methodName(m.name);
179179
var inputClass = _getDartClassName(m.inputType);
180180
out.println("case '${m.name}': return this.$methodName"
181181
'(ctx, request as $inputClass);');
182182
}
183183
out.println('default: '
184-
"throw $coreImportPrefix.ArgumentError('Unknown method: \$method');");
184+
"throw $coreImportPrefix.ArgumentError('Unknown method: \$methodName');");
185185
});
186186
});
187187
out.println();

protoc_plugin/test/goldens/service.pbserver

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -23,17 +23,17 @@ export 'test.pb.dart';
2323
abstract class TestServiceBase extends $pb.GeneratedService {
2424
$async.Future<$0.Empty> ping($pb.ServerContext ctx, $0.Empty request);
2525

26-
$pb.GeneratedMessage createRequest($core.String method) {
27-
switch (method) {
26+
$pb.GeneratedMessage createRequest($core.String methodName) {
27+
switch (methodName) {
2828
case 'Ping': return $0.Empty();
29-
default: throw $core.ArgumentError('Unknown method: $method');
29+
default: throw $core.ArgumentError('Unknown method: $methodName');
3030
}
3131
}
3232

33-
$async.Future<$pb.GeneratedMessage> handleCall($pb.ServerContext ctx, $core.String method, $pb.GeneratedMessage request) {
34-
switch (method) {
33+
$async.Future<$pb.GeneratedMessage> handleCall($pb.ServerContext ctx, $core.String methodName, $pb.GeneratedMessage request) {
34+
switch (methodName) {
3535
case 'Ping': return this.ping(ctx, request as $0.Empty);
36-
default: throw $core.ArgumentError('Unknown method: $method');
36+
default: throw $core.ArgumentError('Unknown method: $methodName');
3737
}
3838
}
3939

protoc_plugin/test/goldens/serviceGenerator

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,19 +2,19 @@ abstract class TestServiceBase extends $pb.GeneratedService {
22
$async.Future<$0.SomeReply> aMethod($pb.ServerContext ctx, $0.SomeRequest request);
33
$async.Future<$1.AnotherReply> anotherMethod($pb.ServerContext ctx, $1.EmptyMessage request);
44

5-
$pb.GeneratedMessage createRequest($core.String method) {
6-
switch (method) {
5+
$pb.GeneratedMessage createRequest($core.String methodName) {
6+
switch (methodName) {
77
case 'AMethod': return $0.SomeRequest();
88
case 'AnotherMethod': return $1.EmptyMessage();
9-
default: throw $core.ArgumentError('Unknown method: $method');
9+
default: throw $core.ArgumentError('Unknown method: $methodName');
1010
}
1111
}
1212

13-
$async.Future<$pb.GeneratedMessage> handleCall($pb.ServerContext ctx, $core.String method, $pb.GeneratedMessage request) {
14-
switch (method) {
13+
$async.Future<$pb.GeneratedMessage> handleCall($pb.ServerContext ctx, $core.String methodName, $pb.GeneratedMessage request) {
14+
switch (methodName) {
1515
case 'AMethod': return this.aMethod(ctx, request as $0.SomeRequest);
1616
case 'AnotherMethod': return this.anotherMethod(ctx, request as $1.EmptyMessage);
17-
default: throw $core.ArgumentError('Unknown method: $method');
17+
default: throw $core.ArgumentError('Unknown method: $methodName');
1818
}
1919
}
2020

0 commit comments

Comments
 (0)