Skip to content

Commit b619e5d

Browse files
committed
Use var/final consistently across repository
1 parent 4f9bc05 commit b619e5d

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

46 files changed

+467
-461
lines changed

_analysis_config/lib/analysis_options.yaml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -25,16 +25,16 @@ linter:
2525
- join_return_with_assignment
2626
- library_names
2727
- literal_only_boolean_expressions
28+
- omit_local_variable_types
29+
- only_throw_errors
2830
- package_api_docs
2931
- package_prefixed_library_names
30-
# - prefer_final_locals
31-
# - prefer_relative_imports
32+
- prefer_final_locals
3233
- prefer_single_quotes
34+
# - prefer_relative_imports
3335
- prefer_void_to_null
3436
- test_types_in_equals
3537
- throw_in_finally
36-
- omit_local_variable_types
37-
- only_throw_errors
3838
- unawaited_futures
3939
- unnecessary_lambdas
4040
- unnecessary_parenthesis

dwds/analysis_options.yaml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,5 +10,4 @@ analyzer:
1010
linter:
1111
rules:
1212
- always_use_package_imports
13-
- prefer_final_locals
1413
- require_trailing_commas

fixtures/_experimentSound/web/main.dart

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -64,9 +64,11 @@ void testClass() {
6464

6565
String testPattern(Object obj) {
6666
switch (obj) {
67-
case [var a, int n] || [int n, var a] when n == 1 && a is String:
67+
case [final a, final int n] || [final int n, final a]
68+
when n == 1 && a is String:
6869
return a.toString(); // Breakpoint: testPatternCase1
69-
case [double n, var a] || [var a, double n] when (n - 3.14).abs() < 0.001:
70+
case [final double n, final a] || [final a, final double n]
71+
when (n - 3.14).abs() < 0.001:
7072
return a.toString(); // Breakpoint: testPatternCase2
7173
default:
7274
return 'default'; // Breakpoint: testPatternDefault

fixtures/_testPackageSound/web/main.dart

Lines changed: 32 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ import 'package:_test_sound/library.dart';
1414

1515
extension NumberParsing on String {
1616
int parseInt() {
17-
var ret = int.parse(this);
17+
final ret = int.parse(this);
1818
return ret; // Breakpoint: extension
1919
}
2020
}
@@ -75,22 +75,22 @@ void printGeneric<T>(T formal) {
7575
}
7676

7777
void printLocal() {
78-
var local = 42;
78+
final local = 42;
7979
print('Local is: $local'); // Breakpoint: printLocal
8080
}
8181

8282
void printFieldFromLibraryClass() {
83-
var instance = TestLibraryClass(1, 2); // Breakpoint: createLibraryObject
83+
final instance = TestLibraryClass(1, 2); // Breakpoint: createLibraryObject
8484
print('$instance'); // Breakpoint: printFieldFromLibraryClass
8585
}
8686

8787
void printFieldFromLibraryPartClass() {
88-
var instance = TestLibraryPartClass(1, 2);
88+
final instance = TestLibraryPartClass(1, 2);
8989
print('$instance'); // Breakpoint: printFieldFromLibraryPartClass
9090
}
9191

9292
void printFieldMain() {
93-
var instance = MainClass(2, 1);
93+
final instance = MainClass(2, 1);
9494
print('$instance'); // Breakpoint: printFieldMain
9595
}
9696

@@ -103,22 +103,22 @@ void printFromTestPackage() {
103103
}
104104

105105
void printFromTestLibrary() {
106-
var local = 23;
106+
final local = 23;
107107
print(testLibraryFunction(local));
108108
}
109109

110110
void printFromTestLibraryPart() {
111-
var local = 23;
111+
final local = 23;
112112
print(testLibraryPartFunction(local));
113113
}
114114

115115
void printCallExtension() {
116-
var local = '23';
116+
final local = '23';
117117
print(local.parseInt());
118118
}
119119

120120
void printLoopVariable() {
121-
var list = <String>['1'];
121+
final list = <String>['1'];
122122
for (var item in list) {
123123
print(item); // Breakpoint: printLoopVariable
124124
}
@@ -147,9 +147,9 @@ void printEnclosingObject(EnclosingClass o) {
147147
}
148148

149149
void printStream() {
150-
var controller = StreamController<int>();
151-
var stream = controller.stream.asBroadcastStream();
152-
var subscription = stream.listen(print);
150+
final controller = StreamController<int>();
151+
final stream = controller.stream.asBroadcastStream();
152+
final subscription = stream.listen(print);
153153
controller.sink.add(0);
154154
subscription.cancel(); // Breakpoint: printStream
155155
}
@@ -185,26 +185,26 @@ void printFrame1() {
185185
}
186186

187187
void printLargeScope() {
188-
var t0 = 0;
189-
var t1 = 1;
190-
var t2 = 2;
191-
var t3 = 3;
192-
var t4 = 4;
193-
var t5 = 5;
194-
var t6 = 6;
195-
var t7 = 7;
196-
var t8 = 8;
197-
var t9 = 9;
198-
var t10 = 10;
199-
var t11 = 11;
200-
var t12 = 12;
201-
var t13 = 13;
202-
var t14 = 14;
203-
var t15 = 15;
204-
var t16 = 16;
205-
var t17 = 17;
206-
var t18 = 18;
207-
var t19 = 19;
188+
final t0 = 0;
189+
final t1 = 1;
190+
final t2 = 2;
191+
final t3 = 3;
192+
final t4 = 4;
193+
final t5 = 5;
194+
final t6 = 6;
195+
final t7 = 7;
196+
final t8 = 8;
197+
final t9 = 9;
198+
final t10 = 10;
199+
final t11 = 11;
200+
final t12 = 12;
201+
final t13 = 13;
202+
final t14 = 14;
203+
final t15 = 15;
204+
final t16 = 16;
205+
final t17 = 17;
206+
final t18 = 18;
207+
final t19 = 19;
208208

209209
print('$t0 $t1, $t2, $t3, $t4, $t5, $t6, $t7, $t8, $t9, $t10, '
210210
'$t11, $t12, $t13, $t14, $t15, $t16, $t17, $t18, $t19'); // Breakpoint: printLargeScope

fixtures/_testSound/example/hello_world/main.dart

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ part 'part.dart';
1818
// dwds/test/chrome_proxy_service_test.dart
1919

2020
final topLevelList = () {
21-
var l = List.filled(1001, 5);
21+
final l = List.filled(1001, 5);
2222
l[4] = 100;
2323
return l;
2424
}();
@@ -37,7 +37,7 @@ void main() async {
3737

3838
// long running to test evaluateInFrame
3939
Timer.periodic(const Duration(seconds: 1), (_) {
40-
var local = 42;
40+
final local = 42;
4141
print(local); // Breakpoint: printLocal
4242
});
4343

@@ -101,13 +101,13 @@ void printCount() {
101101
}
102102

103103
void asyncCall() async {
104-
var now = DateTime.now();
104+
final now = DateTime.now();
105105

106106
await Future.delayed(Duration.zero);
107107

108-
var then = DateTime.now(); // Breakpoint: asyncCall
108+
final then = DateTime.now(); // Breakpoint: asyncCall
109109
// ignore: unused_local_variable
110-
var diff = then.difference(now);
110+
final diff = then.difference(now);
111111
}
112112

113113
void throwsException() {

fixtures/_testSound/example/scopes/main.dart

Lines changed: 15 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -28,15 +28,16 @@ void staticFunction(int formal) {
2828
}
2929

3030
void staticAsyncFunction(String value) async {
31-
var myLocal = await 'a local value';
31+
// ignore: unused_local_variable
32+
final myLocal = await 'a local value';
3233
print(value); // Breakpoint: staticAsyncFunction
3334
}
3435

3536
void staticAsyncLoopFunction(String value) async {
3637
Function? f;
3738
for (var i in [1, 2, 3]) {
3839
print(i);
39-
var myLocal = await 'my local value';
40+
final myLocal = await 'my local value';
4041
f ??= () {
4142
print(value);
4243
print(i);
@@ -48,9 +49,9 @@ void staticAsyncLoopFunction(String value) async {
4849

4950
void main() async {
5051
print('Initial print from scopes app');
51-
var local = 'local in main';
52-
var intLocalInMain = 42;
53-
var testClass = MyTestClass();
52+
final local = 'local in main';
53+
final intLocalInMain = 42;
54+
final testClass = MyTestClass();
5455
Object? localThatsNull;
5556
identityMap['a'] = 1;
5657
identityMap['b'] = 2;
@@ -59,7 +60,7 @@ void main() async {
5960
notAList.add(7);
6061

6162
String nestedFunction<T>(T parameter, Object aClass) {
62-
var another = int.tryParse('$parameter');
63+
final another = int.tryParse('$parameter');
6364
return '$local: parameter, $another'; // Breakpoint: nestedFunction
6465
}
6566

@@ -68,7 +69,7 @@ void main() async {
6869
}
6970

7071
Timer.periodic(const Duration(seconds: 1), (Timer t) {
71-
var ticks = t.tick;
72+
final ticks = t.tick;
7273
// ignore: unused_local_variable, prefer_typing_uninitialized_variables
7374
var closureLocal;
7475
libraryPublicFinal.printCount();
@@ -79,12 +80,12 @@ void main() async {
7980
print(nestedFunction('$ticks ${testClass.message}', Timer));
8081
print(localThatsNull);
8182
print(libraryNull);
82-
var localList = libraryPublic;
83+
final localList = libraryPublic;
8384
print(localList);
8485
localList.add('abc');
85-
var f = testClass.methodWithVariables();
86+
final f = testClass.methodWithVariables();
8687
print(f('parameter'));
87-
var num = '1234'.someExtensionMethod();
88+
final num = '1234'.someExtensionMethod();
8889
print('$num');
8990
});
9091

@@ -96,7 +97,7 @@ void main() async {
9697

9798
String libraryFunction(String arg) {
9899
print('calling a library function with $arg');
99-
var concat = 'some constant plus $arg plus whatever';
100+
final concat = 'some constant plus $arg plus whatever';
100101
print(concat);
101102
return concat;
102103
}
@@ -118,11 +119,11 @@ class MyTestClass<T> extends MyAbstractClass {
118119
String hello() => message;
119120

120121
String Function(String) methodWithVariables() {
121-
var local = '$message + something';
122+
final local = '$message + something';
122123
print(local);
123124
return (String parameter) {
124125
// Be sure to use a field from this, so it isn't entirely optimized away.
125-
var closureLocalInsideMethod = '$message/$local/$parameter';
126+
final closureLocalInsideMethod = '$message/$local/$parameter';
126127
print(closureLocalInsideMethod);
127128
return closureLocalInsideMethod; // Breakpoint: nestedClosure
128129
};
@@ -184,7 +185,7 @@ class NotReallyAList extends ListBase<Object?> {
184185

185186
extension NumberParsing on String {
186187
int someExtensionMethod() {
187-
var ret = int.parse(this);
188+
final ret = int.parse(this);
188189
return ret; // Breakpoint: extension
189190
}
190191
}

fixtures/_webdevSoundSmoke/web/scopes_main.dart

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -27,9 +27,9 @@ void staticFunction(int formal) {
2727

2828
void main() async {
2929
print('Initial print from scopes app');
30-
var local = 'local in main';
31-
var intLocalInMain = 42;
32-
var testClass = MyTestClass();
30+
final local = 'local in main';
31+
final intLocalInMain = 42;
32+
final testClass = MyTestClass();
3333
Object? localThatsNull;
3434
identityMap['a'] = 1;
3535
identityMap['b'] = 2;
@@ -38,7 +38,7 @@ void main() async {
3838
notAList.add(7);
3939

4040
String nestedFunction<T>(T parameter, Object aClass) {
41-
var another = int.tryParse('$parameter');
41+
final another = int.tryParse('$parameter');
4242
return '$local: parameter, $another'; // Breakpoint: nestedFunction
4343
}
4444

@@ -47,7 +47,7 @@ void main() async {
4747
}
4848

4949
Timer.periodic(const Duration(seconds: 1), (Timer t) {
50-
var ticks = t.tick;
50+
final ticks = t.tick;
5151
// ignore: unused_local_variable, prefer_typing_uninitialized_variables
5252
var closureLocal;
5353
libraryPublicFinal.printCount();
@@ -56,10 +56,10 @@ void main() async {
5656
print(nestedFunction('$ticks ${testClass.message}', Timer));
5757
print(localThatsNull);
5858
print(libraryNull);
59-
var localList = libraryPublic;
59+
final localList = libraryPublic;
6060
print(localList);
6161
localList.add('abc');
62-
var f = testClass.methodWithVariables();
62+
final f = testClass.methodWithVariables();
6363
print(f('parameter'));
6464
});
6565

@@ -71,7 +71,7 @@ void main() async {
7171

7272
String libraryFunction(String arg) {
7373
print('calling a library function with $arg');
74-
var concat = 'some constant plus $arg plus whatever';
74+
final concat = 'some constant plus $arg plus whatever';
7575
print(concat);
7676
return concat;
7777
}
@@ -89,11 +89,11 @@ class MyTestClass<T> {
8989
String hello() => message;
9090

9191
String Function(String) methodWithVariables() {
92-
var local = '$message + something';
92+
final local = '$message + something';
9393
print(local);
9494
return (String parameter) {
9595
// Be sure to use a field from this, so it isn't entirely optimized away.
96-
var closureLocalInsideMethod = '$message/$local/$parameter';
96+
final closureLocalInsideMethod = '$message/$local/$parameter';
9797
print(closureLocalInsideMethod);
9898
return closureLocalInsideMethod; // Breakpoint: nestedClosure
9999
};

0 commit comments

Comments
 (0)