[fasta] Add and correct even more offsets

pkg/front_end/lib/src/fasta/parser/parser.dart

Index: pkg/front_end/lib/src/fasta/parser/parser.dart
diff --git a/pkg/front_end/lib/src/fasta/parser/parser.dart b/pkg/front_end/lib/src/fasta/parser/parser.dart
index d20a5a3bdc927426b35e945aeec30786157c6fd2..ea9a275d3649d0ee9349f26d41959095f42e9df3 100644
--- a/pkg/front_end/lib/src/fasta/parser/parser.dart
+++ b/pkg/front_end/lib/src/fasta/parser/parser.dart
@@ -519,6 +519,7 @@ class Parser {
     bool isNamedParameter = kind == FormalParameterType.NAMED;
 
     Token thisKeyword = null;
+    Token nameToken;
     if (inFunctionType && isNamedParameter) {
       token = parseType(token);
       token =
@@ -536,8 +537,10 @@ class Parser {
       if (optional('this', token)) {
         thisKeyword = token;
         token = expect('.', token.next);
+        nameToken = token;
         token = parseIdentifier(token, IdentifierContext.fieldInitializer);
       } else {
+        nameToken = token;
         token = parseIdentifier(
             token, IdentifierContext.formalParameterDeclaration);
       }
@@ -586,7 +589,7 @@ class Parser {
     } else {
       listener.handleFormalParameterWithoutValue(token);
     }
-    listener.endFormalParameter(covariantKeyword, thisKeyword, kind);
+    listener.endFormalParameter(covariantKeyword, thisKeyword, nameToken, kind);
     return token;
   }
 
@@ -1279,6 +1282,7 @@ class Parser {
     } else {
       listener.handleNoTypeVariables(token);
     }
+    Token formalParametersToken = token;
     token = parseFormalParametersOpt(token);
     bool previousAsyncAwaitKeywordsEnabled = asyncAwaitKeywordsEnabled;
     token = parseAsyncModifier(token);
@@ -1286,7 +1290,8 @@ class Parser {
     asyncAwaitKeywordsEnabled = previousAsyncAwaitKeywordsEnabled;
     Token endToken = token;
     token = token.next;
-    listener.endTopLevelMethod(start, getOrSet, endToken);
+    listener.endTopLevelMethod(
+        start, getOrSet, formalParametersToken, endToken);

[ahe, 2017/03/13 14:33:52]

Have you tested this situation:

get foo => "foo";

[jensj, 2017/03/14 12:37:12]

Well -- the name is misleading (the token is '=>') --- other than that I think
it's fine... I will add a service test that steps through such a thing though
(different CL).
Do you have an idea for a better name?

     return token;
   }
 
@@ -1819,6 +1824,7 @@ class Parser {
     } else {
       listener.handleNoTypeVariables(token);
     }
+    Token formalParametersToken = token;
     token = parseFormalParametersOpt(token);
     token = parseInitializersOpt(token);
     bool previousAsyncAwaitKeywordsEnabled = asyncAwaitKeywordsEnabled;
@@ -1830,7 +1836,7 @@ class Parser {
           token, false, staticModifier == null || externalModifier != null);
     }
     asyncAwaitKeywordsEnabled = previousAsyncAwaitKeywordsEnabled;
-    listener.endMethod(getOrSet, start, token);
+    listener.endMethod(getOrSet, start, formalParametersToken, token);
     return token.next;
   }
 
@@ -1851,6 +1857,7 @@ class Parser {
     listener.beginFactoryMethod(factoryKeyword);
     token = expect('factory', token);
     token = parseConstructorReference(token);
+    Token formalParametersToken = token;
     token = parseFormalParameters(token);
     token = parseAsyncModifier(token);
     if (optional('=', token)) {
@@ -1858,7 +1865,8 @@ class Parser {
     } else {
       token = parseFunctionBody(token, false, isExternal);
     }
-    listener.endFactoryMethod(start, factoryKeyword, token);
+    listener.endFactoryMethod(
+        start, factoryKeyword, formalParametersToken, token);
     return token.next;
   }
 
@@ -1875,6 +1883,7 @@ class Parser {
   }
 
   Token parseFunction(Token token, Token getOrSet) {
+    Token beginToken = token;
     listener.beginFunction(token);
     token = parseModifiers(token);
     if (identical(getOrSet, token)) {
@@ -1909,23 +1918,25 @@ class Parser {
     }
     token = parseQualifiedRestOpt(
         token, IdentifierContext.localFunctionDeclarationContinuation);
-    listener.endFunctionName(token);
+    listener.endFunctionName(beginToken, token);
     if (getOrSet == null) {
       token = parseTypeVariablesOpt(token);
     } else {
       listener.handleNoTypeVariables(token);
     }
+    Token formalParametersToken = token;
     token = parseFormalParametersOpt(token);
     token = parseInitializersOpt(token);
     bool previousAsyncAwaitKeywordsEnabled = asyncAwaitKeywordsEnabled;
     token = parseAsyncModifier(token);
     token = parseFunctionBody(token, false, true);
     asyncAwaitKeywordsEnabled = previousAsyncAwaitKeywordsEnabled;
-    listener.endFunction(getOrSet, token);
+    listener.endFunction(getOrSet, formalParametersToken, token);
     return token.next;
   }
 
   Token parseUnnamedFunction(Token token) {
+    Token beginToken = token;
     listener.beginUnnamedFunction(token);
     token = parseFormalParameters(token);
     bool previousAsyncAwaitKeywordsEnabled = asyncAwaitKeywordsEnabled;
@@ -1933,7 +1944,7 @@ class Parser {
     bool isBlock = optional('{', token);
     token = parseFunctionBody(token, true, false);
     asyncAwaitKeywordsEnabled = previousAsyncAwaitKeywordsEnabled;
-    listener.endUnnamedFunction(token);
+    listener.endUnnamedFunction(beginToken, token);
     return isBlock ? token.next : token;
   }
 
@@ -1945,13 +1956,15 @@ class Parser {
   }
 
   Token parseFunctionExpression(Token token) {
+    Token beginToken = token;
     listener.beginFunction(token);
     listener.handleModifiers(0);
     token = parseReturnTypeOpt(token);
     listener.beginFunctionName(token);
     token = parseIdentifier(token, IdentifierContext.functionExpressionName);
-    listener.endFunctionName(token);
+    listener.endFunctionName(beginToken, token);
     token = parseTypeVariablesOpt(token);
+    Token formalParametersToken = token;
     token = parseFormalParameters(token);
     listener.handleNoInitializers();
     bool previousAsyncAwaitKeywordsEnabled = asyncAwaitKeywordsEnabled;
@@ -1959,7 +1972,7 @@ class Parser {
     bool isBlock = optional('{', token);
     token = parseFunctionBody(token, true, false);
     asyncAwaitKeywordsEnabled = previousAsyncAwaitKeywordsEnabled;
-    listener.endFunction(null, token);
+    listener.endFunction(null, formalParametersToken, token);
     return isBlock ? token.next : token;
   }