Rename statment -> stmt in testing annotations.

We are probably going to want to use this often enough that giving it
a short name will save a lot of typing.

Change-Id: Id95297183afa9d8e87002b93900d5c279401c74d
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/108267
Reviewed-by: Johnni Winther <[email protected]>
Commit-Queue: Paul Berry <[email protected]>

Author: stereotype441

pkg/analyzer/lib/src/util/ast_data_extractor.dart

@@ -61,7 +61,7 @@ abstract class AstDataExtractor<T> extends GeneralizingAstVisitor<dynamic>
   }
 
   NodeId createStatementId(Statement node) =>
-      NodeId(_nodeOffset(node), IdKind.statement);
+      NodeId(_nodeOffset(node), IdKind.stmt);
 
   @override
   void fail(String message) {

pkg/analyzer/test/src/dart/resolution/flow_analysis_test.dart

@@ -357,7 +357,7 @@ void f() {
   do {
     1;
   } while (true);
-  /*statement: unreachable*/ 2;
+  /*stmt: unreachable*/ 2;
 }
 ''');
   }
@@ -367,14 +367,14 @@ void f() {
 /*member: f:doesNotComplete*/
 void f(bool b, int i) {
   return;
-  /*statement: unreachable*/ Object _;
-  /*statement: unreachable*/ do {} while (b);
-  /*statement: unreachable*/ for (;;) {}
-  /*statement: unreachable*/ for (_ in []) {}
-  /*statement: unreachable*/ if (b) {}
-  /*statement: unreachable*/ switch (i) {}
-  /*statement: unreachable*/ try {} finally {}
-  /*statement: unreachable*/ while (b) {}
+  /*stmt: unreachable*/ Object _;
+  /*stmt: unreachable*/ do {} while (b);
+  /*stmt: unreachable*/ for (;;) {}
+  /*stmt: unreachable*/ for (_ in []) {}
+  /*stmt: unreachable*/ if (b) {}
+  /*stmt: unreachable*/ switch (i) {}
+  /*stmt: unreachable*/ try {} finally {}
+  /*stmt: unreachable*/ while (b) {}
 }
 ''');
   }
@@ -386,7 +386,7 @@ void f() {
   for (; true;) {
     1;
   }
-  /*statement: unreachable*/ 2;
+  /*stmt: unreachable*/ 2;
 }
 ''');
   }
@@ -398,7 +398,7 @@ void f() {
   for (;;) {
     1;
   }
-  /*statement: unreachable*/ 2;
+  /*stmt: unreachable*/ 2;
 }
 ''');
   }
@@ -449,7 +449,7 @@ void f(bool b) {
   test_if_false_then_else() async {
     await trackCode(r'''
 void f() {
-  if (false) /*statement: unreachable*/ {
+  if (false) /*stmt: unreachable*/ {
     1;
   } else {
   }
@@ -466,7 +466,7 @@ void f() {
   if (true) {
     return;
   }
-  /*statement: unreachable*/ 2;
+  /*stmt: unreachable*/ 2;
 }
 ''');
   }
@@ -475,7 +475,7 @@ void f() {
     await trackCode(r'''
 void f() {
   if (true) {
-  } else /*statement: unreachable*/ {
+  } else /*stmt: unreachable*/ {
     2;
   }
   3;
@@ -510,7 +510,7 @@ void f(bool b, int i) {
       } else {
         return;
       }
-      /*statement: unreachable*/ 2;
+      /*stmt: unreachable*/ 2;
   }
   3;
 }
@@ -536,7 +536,7 @@ void f() {
   try {
     1;
     return;
-    /*statement: unreachable*/ 2;
+    /*stmt: unreachable*/ 2;
   } catch (_) {
     3;
   }
@@ -553,7 +553,7 @@ void f() {
   } catch (_) {
     2;
     return;
-    /*statement: unreachable*/ 3;
+    /*stmt: unreachable*/ 3;
   }
   4;
 }
@@ -589,7 +589,7 @@ void f() {
   } finally {
     3;
   }
-  /*statement: unreachable*/ 4;
+  /*stmt: unreachable*/ 4;
 }
 ''');
   }
@@ -620,15 +620,15 @@ void f() {
   } finally {
     2;
   }
-  /*statement: unreachable*/ 3;
+  /*stmt: unreachable*/ 3;
 }
 ''');
   }
 
   test_while_false() async {
     await trackCode(r'''
 void f() {
-  while (false) /*statement: unreachable*/ {
+  while (false) /*stmt: unreachable*/ {
     1;
   }
   2;
@@ -643,8 +643,8 @@ void f() {
   while (true) {
     1;
   }
-  /*statement: unreachable*/ 2;
-  /*statement: unreachable*/ 3;
+  /*stmt: unreachable*/ 2;
+  /*stmt: unreachable*/ 3;
 }
 ''');
   }
@@ -655,7 +655,7 @@ void f() {
   while (true) {
     1;
     break;
-    /*statement: unreachable*/ 2;
+    /*stmt: unreachable*/ 2;
   }
   3;
 }
@@ -682,9 +682,9 @@ void f() {
   while (true) {
     1;
     continue;
-    /*statement: unreachable*/ 2;
+    /*stmt: unreachable*/ 2;
   }
-  /*statement: unreachable*/ 3;
+  /*stmt: unreachable*/ 3;
 }
 ''');
   }

pkg/front_end/lib/src/testing/id.dart

@@ -11,7 +11,7 @@ enum IdKind {
   iterator,
   current,
   moveNext,
-  statement,
+  stmt,
 }
 
 /// Id for a code point or element.
@@ -62,8 +62,8 @@ class IdValue {
         return '$currentPrefix$value';
       case IdKind.moveNext:
         return '$moveNextPrefix$value';
-      case IdKind.statement:
-        return '$statementPrefix$value';
+      case IdKind.stmt:
+        return '$stmtPrefix$value';
     }
     throw new UnsupportedError("Unexpected id kind: ${id.kind}");
   }
@@ -76,7 +76,7 @@ class IdValue {
   static const String iteratorPrefix = "iterator: ";
   static const String currentPrefix = "current: ";
   static const String moveNextPrefix = "moveNext: ";
-  static const String statementPrefix = "statement: ";
+  static const String stmtPrefix = "stmt: ";
 
   static IdValue decode(int offset, String text) {
     Id id;
@@ -118,9 +118,9 @@ class IdValue {
     } else if (text.startsWith(moveNextPrefix)) {
       id = new NodeId(offset, IdKind.moveNext);
       expected = text.substring(moveNextPrefix.length);
-    } else if (text.startsWith(statementPrefix)) {
-      id = new NodeId(offset, IdKind.statement);
-      expected = text.substring(statementPrefix.length);
+    } else if (text.startsWith(stmtPrefix)) {
+      id = new NodeId(offset, IdKind.stmt);
+      expected = text.substring(stmtPrefix.length);
     } else {
       id = new NodeId(offset, IdKind.node);
       expected = text;