diff --git a/pkg/analyzer/test/src/dart/analysis/driver_resolution_test.dart b/pkg/analyzer/test/src/dart/analysis/driver_resolution_test.dart
index bc60abe9..870d899 100644
--- a/pkg/analyzer/test/src/dart/analysis/driver_resolution_test.dart
+++ b/pkg/analyzer/test/src/dart/analysis/driver_resolution_test.dart
@@ -800,7 +800,7 @@
 BinaryExpression
   leftOperand: SimpleIdentifier
     token: a
-    staticElement: a@54
+    staticElement: self::@function::f::@parameter::a
     staticType: A
   operator: >>>
   rightOperand: IntegerLiteral
diff --git a/pkg/analyzer/test/src/dart/resolution/assignment_test.dart b/pkg/analyzer/test/src/dart/resolution/assignment_test.dart
index 4d61216..2a5f408 100644
--- a/pkg/analyzer/test/src/dart/resolution/assignment_test.dart
+++ b/pkg/analyzer/test/src/dart/resolution/assignment_test.dart
@@ -136,7 +136,7 @@
   leftHandSide: IndexExpression
     target: SimpleIdentifier
       token: a
-      staticElement: a@91
+      staticElement: self::@function::f::@parameter::a
       staticType: A
     leftBracket: [
     index: IntegerLiteral
@@ -177,7 +177,7 @@
   leftHandSide: IndexExpression
     target: SimpleIdentifier
       token: a
-      staticElement: a@91
+      staticElement: self::@function::f::@parameter::a
       staticType: A
     leftBracket: [
     index: IntegerLiteral
@@ -218,7 +218,7 @@
   leftHandSide: IndexExpression
     target: SimpleIdentifier
       token: a
-      staticElement: a@95
+      staticElement: self::@function::f::@parameter::a
       staticType: A
     leftBracket: [
     index: IntegerLiteral
@@ -258,7 +258,7 @@
   leftHandSide: IndexExpression
     target: SimpleIdentifier
       token: a
-      staticElement: a@57
+      staticElement: self::@function::f::@parameter::a
       staticType: A
     leftBracket: [
     index: IntegerLiteral
@@ -392,7 +392,7 @@
   operator: =
   rightHandSide: SimpleIdentifier
     token: c
-    staticElement: c@11
+    staticElement: self::@function::f::@parameter::c
     staticType: int
   readElement: <null>
   readType: null
@@ -420,7 +420,7 @@
   leftHandSide: IndexExpression
     target: SimpleIdentifier
       token: a
-      staticElement: a@11
+      staticElement: self::@function::f::@parameter::a
       staticType: int
     leftBracket: [
     index: SimpleIdentifier
@@ -433,7 +433,7 @@
   operator: =
   rightHandSide: SimpleIdentifier
     token: c
-    staticElement: c@18
+    staticElement: self::@function::f::@parameter::c
     staticType: int
   readElement: <null>
   readType: null
@@ -464,7 +464,7 @@
   leftHandSide: IndexExpression
     target: SimpleIdentifier
       token: a
-      staticElement: a@57
+      staticElement: self::@function::f::@parameter::a
       staticType: A
     leftBracket: [
     index: SimpleIdentifier
@@ -477,7 +477,7 @@
   operator: =
   rightHandSide: SimpleIdentifier
     token: c
-    staticElement: c@64
+    staticElement: self::@function::f::@parameter::c
     staticType: int
   readElement: <null>
   readType: null
@@ -505,12 +505,12 @@
   leftHandSide: BinaryExpression
     leftOperand: SimpleIdentifier
       token: a
-      staticElement: a@11
+      staticElement: self::@function::f::@parameter::a
       staticType: int
     operator: +
     rightOperand: SimpleIdentifier
       token: b
-      staticElement: b@18
+      staticElement: self::@function::f::@parameter::b
       staticType: int
     staticElement: dart:core::@class::num::@method::+
     staticInvokeType: num Function(num)
@@ -518,7 +518,7 @@
   operator: +=
   rightHandSide: SimpleIdentifier
     token: c
-    staticElement: c@28
+    staticElement: self::@function::f::@parameter::c
     staticType: double
   readElement: <null>
   readType: dynamic
@@ -548,12 +548,12 @@
     expression: BinaryExpression
       leftOperand: SimpleIdentifier
         token: a
-        staticElement: a@11
+        staticElement: self::@function::f::@parameter::a
         staticType: int
       operator: +
       rightOperand: SimpleIdentifier
         token: b
-        staticElement: b@18
+        staticElement: self::@function::f::@parameter::b
         staticType: int
       staticElement: dart:core::@class::num::@method::+
       staticInvokeType: num Function(num)
@@ -563,7 +563,7 @@
   operator: +=
   rightHandSide: SimpleIdentifier
     token: c
-    staticElement: c@28
+    staticElement: self::@function::f::@parameter::c
     staticType: double
   readElement: <null>
   readType: dynamic
@@ -593,12 +593,12 @@
     expression: BinaryExpression
       leftOperand: SimpleIdentifier
         token: a
-        staticElement: a@11
+        staticElement: self::@function::f::@parameter::a
         staticType: int
       operator: +
       rightOperand: SimpleIdentifier
         token: b
-        staticElement: b@18
+        staticElement: self::@function::f::@parameter::b
         staticType: int
       staticElement: dart:core::@class::num::@method::+
       staticInvokeType: num Function(num)
@@ -608,7 +608,7 @@
   operator: =
   rightHandSide: SimpleIdentifier
     token: c
-    staticElement: c@28
+    staticElement: self::@function::f::@parameter::c
     staticType: double
   readElement: <null>
   readType: null
@@ -636,19 +636,19 @@
   leftHandSide: PostfixExpression
     operand: SimpleIdentifier
       token: x
-      staticElement: x@11
+      staticElement: self::@function::f::@parameter::x
       staticType: null
     operator: ++
-    readElement: x@11
+    readElement: self::@function::f::@parameter::x
     readType: num
-    writeElement: x@11
+    writeElement: self::@function::f::@parameter::x
     writeType: num
     staticElement: dart:core::@class::num::@method::+
     staticType: num
   operator: +=
   rightHandSide: SimpleIdentifier
     token: y
-    staticElement: y@18
+    staticElement: self::@function::f::@parameter::y
     staticType: int
   readElement: <null>
   readType: dynamic
@@ -676,19 +676,19 @@
   leftHandSide: PostfixExpression
     operand: SimpleIdentifier
       token: x
-      staticElement: x@11
+      staticElement: self::@function::f::@parameter::x
       staticType: null
     operator: ++
-    readElement: x@11
+    readElement: self::@function::f::@parameter::x
     readType: num
-    writeElement: x@11
+    writeElement: self::@function::f::@parameter::x
     writeType: num
     staticElement: dart:core::@class::num::@method::+
     staticType: num
   operator: ??=
   rightHandSide: SimpleIdentifier
     token: y
-    staticElement: y@18
+    staticElement: self::@function::f::@parameter::y
     staticType: int
   readElement: <null>
   readType: dynamic
@@ -716,19 +716,19 @@
   leftHandSide: PostfixExpression
     operand: SimpleIdentifier
       token: x
-      staticElement: x@11
+      staticElement: self::@function::f::@parameter::x
       staticType: null
     operator: ++
-    readElement: x@11
+    readElement: self::@function::f::@parameter::x
     readType: num
-    writeElement: x@11
+    writeElement: self::@function::f::@parameter::x
     writeType: num
     staticElement: dart:core::@class::num::@method::+
     staticType: num
   operator: =
   rightHandSide: SimpleIdentifier
     token: y
-    staticElement: y@18
+    staticElement: self::@function::f::@parameter::y
     staticType: int
   readElement: <null>
   readType: null
@@ -757,18 +757,18 @@
     operator: ++
     operand: SimpleIdentifier
       token: x
-      staticElement: x@11
+      staticElement: self::@function::f::@parameter::x
       staticType: null
-    readElement: x@11
+    readElement: self::@function::f::@parameter::x
     readType: num
-    writeElement: x@11
+    writeElement: self::@function::f::@parameter::x
     writeType: num
     staticElement: dart:core::@class::num::@method::+
     staticType: num
   operator: +=
   rightHandSide: SimpleIdentifier
     token: y
-    staticElement: y@18
+    staticElement: self::@function::f::@parameter::y
     staticType: int
   readElement: <null>
   readType: dynamic
@@ -797,18 +797,18 @@
     operator: ++
     operand: SimpleIdentifier
       token: x
-      staticElement: x@11
+      staticElement: self::@function::f::@parameter::x
       staticType: null
-    readElement: x@11
+    readElement: self::@function::f::@parameter::x
     readType: num
-    writeElement: x@11
+    writeElement: self::@function::f::@parameter::x
     writeType: num
     staticElement: dart:core::@class::num::@method::+
     staticType: num
   operator: ??=
   rightHandSide: SimpleIdentifier
     token: y
-    staticElement: y@18
+    staticElement: self::@function::f::@parameter::y
     staticType: int
   readElement: <null>
   readType: dynamic
@@ -837,18 +837,18 @@
     operator: ++
     operand: SimpleIdentifier
       token: x
-      staticElement: x@11
+      staticElement: self::@function::f::@parameter::x
       staticType: null
-    readElement: x@11
+    readElement: self::@function::f::@parameter::x
     readType: num
-    writeElement: x@11
+    writeElement: self::@function::f::@parameter::x
     writeType: num
     staticElement: dart:core::@class::num::@method::+
     staticType: num
   operator: =
   rightHandSide: SimpleIdentifier
     token: y
-    staticElement: y@18
+    staticElement: self::@function::f::@parameter::y
     staticType: int
   readElement: <null>
   readType: null
@@ -955,7 +955,7 @@
   leftHandSide: PrefixedIdentifier
     prefix: SimpleIdentifier
       token: a
-      staticElement: a@58
+      staticElement: self::@function::f::@parameter::a
       staticType: A
     period: .
     identifier: SimpleIdentifier
@@ -996,7 +996,7 @@
   leftHandSide: PrefixedIdentifier
     prefix: SimpleIdentifier
       token: a
-      staticElement: a@60
+      staticElement: self::@function::f::@parameter::a
       staticType: A
     period: .
     identifier: SimpleIdentifier
@@ -1036,7 +1036,7 @@
   leftHandSide: PrefixedIdentifier
     prefix: SimpleIdentifier
       token: a
-      staticElement: a@40
+      staticElement: self::@function::f::@parameter::a
       staticType: A
     period: .
     identifier: SimpleIdentifier
@@ -1078,7 +1078,7 @@
   leftHandSide: PrefixedIdentifier
     prefix: SimpleIdentifier
       token: a
-      staticElement: a@40
+      staticElement: self::@function::f::@parameter::a
       staticType: A
     period: .
     identifier: SimpleIdentifier
@@ -1295,7 +1295,7 @@
   operator: =
   rightHandSide: SimpleIdentifier
     token: c
-    staticElement: c@11
+    staticElement: self::@function::f::@parameter::c
     staticType: int
   readElement: <null>
   readType: null
@@ -1323,7 +1323,7 @@
   leftHandSide: PrefixedIdentifier
     prefix: SimpleIdentifier
       token: a
-      staticElement: a@11
+      staticElement: self::@function::f::@parameter::a
       staticType: int
     period: .
     identifier: SimpleIdentifier
@@ -1335,7 +1335,7 @@
   operator: +=
   rightHandSide: SimpleIdentifier
     token: c
-    staticElement: c@18
+    staticElement: self::@function::f::@parameter::c
     staticType: int
   readElement: <null>
   readType: dynamic
@@ -1455,7 +1455,7 @@
       leftParenthesis: (
       expression: SimpleIdentifier
         token: a
-        staticElement: a@58
+        staticElement: self::@function::f::@parameter::a
         staticType: A
       rightParenthesis: )
       staticType: A
@@ -1507,7 +1507,7 @@
       leftParenthesis: (
       expression: SimpleIdentifier
         token: c
-        staticElement: c@134
+        staticElement: self::@function::f::@parameter::c
         staticType: C
       rightParenthesis: )
       staticType: C
@@ -1551,7 +1551,7 @@
       leftParenthesis: (
       expression: SimpleIdentifier
         token: a
-        staticElement: a@60
+        staticElement: self::@function::f::@parameter::a
         staticType: A
       rightParenthesis: )
       staticType: A
@@ -1594,7 +1594,7 @@
       leftParenthesis: (
       expression: SimpleIdentifier
         token: a
-        staticElement: a@40
+        staticElement: self::@function::f::@parameter::a
         staticType: A
       rightParenthesis: )
       staticType: A
@@ -1731,7 +1731,7 @@
   operator: =
   rightHandSide: SimpleIdentifier
     token: c
-    staticElement: c@11
+    staticElement: self::@function::f::@parameter::c
     staticType: int
   readElement: <null>
   readType: null
@@ -1760,7 +1760,7 @@
       leftParenthesis: (
       expression: SimpleIdentifier
         token: a
-        staticElement: a@11
+        staticElement: self::@function::f::@parameter::a
         staticType: int
       rightParenthesis: )
       staticType: int
@@ -1773,7 +1773,7 @@
   operator: =
   rightHandSide: SimpleIdentifier
     token: c
-    staticElement: c@18
+    staticElement: self::@function::f::@parameter::c
     staticType: int
   readElement: <null>
   readType: null
@@ -2156,15 +2156,15 @@
 AssignmentExpression
   leftHandSide: SimpleIdentifier
     token: x
-    staticElement: x@12
+    staticElement: self::@function::f::@parameter::x
     staticType: null
   operator: ??=
   rightHandSide: IntegerLiteral
     literal: 0
     staticType: int
-  readElement: x@12
+  readElement: self::@function::f::@parameter::x
   readType: num?
-  writeElement: x@12
+  writeElement: self::@function::f::@parameter::x
   writeType: num?
   staticElement: <null>
   staticType: num
@@ -2190,7 +2190,7 @@
 AssignmentExpression
   leftHandSide: SimpleIdentifier
     token: x
-    staticElement: x@64
+    staticElement: self::@function::f::@parameter::x
     staticType: null
   operator: ??=
   rightHandSide: InstanceCreationExpression
@@ -2206,9 +2206,9 @@
       leftParenthesis: (
       rightParenthesis: )
     staticType: C
-  readElement: x@64
+  readElement: self::@function::f::@parameter::x
   readType: B?
-  writeElement: x@64
+  writeElement: self::@function::f::@parameter::x
   writeType: B?
   staticElement: <null>
   staticType: A
@@ -2230,16 +2230,16 @@
 AssignmentExpression
   leftHandSide: SimpleIdentifier
     token: a
-    staticElement: a@15
+    staticElement: self::@function::f::@parameter::a
     staticType: null
   operator: ??=
   rightHandSide: SimpleIdentifier
     token: b
-    staticElement: b@22
+    staticElement: self::@function::f::@parameter::b
     staticType: int
-  readElement: a@15
+  readElement: self::@function::f::@parameter::a
   readType: double?
-  writeElement: a@15
+  writeElement: self::@function::f::@parameter::a
   writeType: double?
   staticElement: <null>
   staticType: num
@@ -2296,7 +2296,7 @@
 AssignmentExpression
   leftHandSide: SimpleIdentifier
     token: x
-    staticElement: x@11
+    staticElement: self::@function::f::@parameter::x
     staticType: null
   operator: =
   rightHandSide: IntegerLiteral
@@ -2304,7 +2304,7 @@
     staticType: int
   readElement: <null>
   readType: null
-  writeElement: x@11
+  writeElement: self::@function::f::@parameter::x
   writeType: num
   staticElement: <null>
   staticType: int
@@ -2326,7 +2326,7 @@
 AssignmentExpression
   leftHandSide: SimpleIdentifier
     token: x
-    staticElement: x@14
+    staticElement: self::@function::f::@parameter::x
     staticType: null
   operator: =
   rightHandSide: IntegerLiteral
@@ -2334,7 +2334,7 @@
     staticType: double
   readElement: <null>
   readType: null
-  writeElement: x@14
+  writeElement: self::@function::f::@parameter::x
   writeType: Object
   staticElement: <null>
   staticType: double
@@ -2356,7 +2356,7 @@
 AssignmentExpression
   leftHandSide: SimpleIdentifier
     token: x
-    staticElement: x@11
+    staticElement: self::@function::f::@parameter::x
     staticType: null
   operator: =
   rightHandSide: BooleanLiteral
@@ -2364,7 +2364,7 @@
     staticType: bool
   readElement: <null>
   readType: null
-  writeElement: x@11
+  writeElement: self::@function::f::@parameter::x
   writeType: int
   staticElement: <null>
   staticType: bool
@@ -2386,7 +2386,7 @@
 AssignmentExpression
   leftHandSide: SimpleIdentifier
     token: x
-    staticElement: x@17
+    staticElement: self::@function::f::@parameter::x
     staticType: null
   operator: =
   rightHandSide: IntegerLiteral
@@ -2394,7 +2394,7 @@
     staticType: int
   readElement: <null>
   readType: null
-  writeElement: x@17
+  writeElement: self::@function::f::@parameter::x
   writeType: int
   staticElement: <null>
   staticType: int
@@ -2533,7 +2533,7 @@
   operator: =
   rightHandSide: SimpleIdentifier
     token: y
-    staticElement: y@11
+    staticElement: self::@function::f::@parameter::y
     staticType: int
   readElement: <null>
   readType: null
@@ -3040,7 +3040,7 @@
   operator: =
   rightHandSide: SimpleIdentifier
     token: a
-    staticElement: a@11
+    staticElement: self::@function::f::@parameter::a
     staticType: int
   readElement: <null>
   readType: null
diff --git a/pkg/analyzer/test/src/dart/resolution/binary_expression_test.dart b/pkg/analyzer/test/src/dart/resolution/binary_expression_test.dart
index e3c07756..a848c7c 100644
--- a/pkg/analyzer/test/src/dart/resolution/binary_expression_test.dart
+++ b/pkg/analyzer/test/src/dart/resolution/binary_expression_test.dart
@@ -63,12 +63,12 @@
 BinaryExpression
   leftOperand: SimpleIdentifier
     token: x
-    staticElement: x@12
+    staticElement: self::@function::f::@parameter::x
     staticType: int?
   operator: ??
   rightOperand: SimpleIdentifier
     token: y
-    staticElement: y@19
+    staticElement: self::@function::f::@parameter::y
     staticType: int
   staticElement: <null>
   staticInvokeType: null
@@ -87,12 +87,12 @@
 BinaryExpression
   leftOperand: SimpleIdentifier
     token: x
-    staticElement: x@12
+    staticElement: self::@function::f::@parameter::x
     staticType: int?
   operator: ??
   rightOperand: SimpleIdentifier
     token: y
-    staticElement: y@23
+    staticElement: self::@function::f::@parameter::y
     staticType: double?
   staticElement: <null>
   staticInvokeType: null
@@ -111,12 +111,12 @@
 BinaryExpression
   leftOperand: SimpleIdentifier
     token: x
-    staticElement: x@12
+    staticElement: self::@function::f::@parameter::x
     staticType: int?
   operator: ??
   rightOperand: SimpleIdentifier
     token: x
-    staticElement: x@12
+    staticElement: self::@function::f::@parameter::x
     staticType: int?
   staticElement: <null>
   staticInvokeType: null
@@ -135,12 +135,12 @@
 BinaryExpression
   leftOperand: SimpleIdentifier
     token: a
-    staticElement: a@6
+    staticElement: self::@function::f::@parameter::a
     staticType: int
   operator: +
   rightOperand: SimpleIdentifier
     token: b
-    staticElement: b@15
+    staticElement: self::@function::f::@parameter::b
     staticType: Never
   staticElement: dart:core::@class::num::@method::+
   staticInvokeType: num Function(num)
@@ -162,12 +162,12 @@
 BinaryExpression
   leftOperand: SimpleIdentifier
     token: a
-    staticElement: a@8
+    staticElement: self::@function::f::@parameter::a
     staticType: Never
   operator: +
   rightOperand: SimpleIdentifier
     token: b
-    staticElement: b@15
+    staticElement: self::@function::f::@parameter::b
     staticType: int
   staticElement: <null>
   staticInvokeType: null
@@ -188,12 +188,12 @@
 BinaryExpression
   leftOperand: SimpleIdentifier
     token: a
-    staticElement: a@6
+    staticElement: self::@function::f::@parameter::a
     staticType: int
   operator: !=
   rightOperand: SimpleIdentifier
     token: b
-    staticElement: b@13
+    staticElement: self::@function::f::@parameter::b
     staticType: int
   staticElement: dart:core::@class::num::@method::==
   staticInvokeType: bool Function(Object)
@@ -224,7 +224,7 @@
       arguments
         SimpleIdentifier
           token: a
-          staticElement: a@34
+          staticElement: self::@function::f::@parameter::a
           staticType: int
       rightParenthesis: )
     extendedType: int
@@ -252,12 +252,12 @@
 BinaryExpression
   leftOperand: SimpleIdentifier
     token: a
-    staticElement: a@6
+    staticElement: self::@function::f::@parameter::a
     staticType: int
   operator: !==
   rightOperand: SimpleIdentifier
     token: b
-    staticElement: b@13
+    staticElement: self::@function::f::@parameter::b
     staticType: int
   staticElement: <null>
   staticInvokeType: null
@@ -276,12 +276,12 @@
 BinaryExpression
   leftOperand: SimpleIdentifier
     token: a
-    staticElement: a@6
+    staticElement: self::@function::f::@parameter::a
     staticType: int
   operator: ==
   rightOperand: SimpleIdentifier
     token: b
-    staticElement: b@13
+    staticElement: self::@function::f::@parameter::b
     staticType: int
   staticElement: dart:core::@class::num::@method::==
   staticInvokeType: bool Function(Object)
@@ -312,7 +312,7 @@
       arguments
         SimpleIdentifier
           token: a
-          staticElement: a@34
+          staticElement: self::@function::f::@parameter::a
           staticType: int
       rightParenthesis: )
     extendedType: int
@@ -340,12 +340,12 @@
 BinaryExpression
   leftOperand: SimpleIdentifier
     token: a
-    staticElement: a@6
+    staticElement: self::@function::f::@parameter::a
     staticType: int
   operator: ===
   rightOperand: SimpleIdentifier
     token: b
-    staticElement: b@13
+    staticElement: self::@function::f::@parameter::b
     staticType: int
   staticElement: <null>
   staticInvokeType: null
@@ -365,12 +365,12 @@
 BinaryExpression
   leftOperand: SimpleIdentifier
     token: a
-    staticElement: a@7
+    staticElement: self::@function::f::@parameter::a
     staticType: int?
   operator: ??
   rightOperand: SimpleIdentifier
     token: b
-    staticElement: b@17
+    staticElement: self::@function::f::@parameter::b
     staticType: double
   staticElement: <null>
   staticInvokeType: null
@@ -389,12 +389,12 @@
 BinaryExpression
   leftOperand: SimpleIdentifier
     token: a
-    staticElement: a@7
+    staticElement: self::@function::f::@parameter::a
     staticType: bool
   operator: &&
   rightOperand: SimpleIdentifier
     token: b
-    staticElement: b@15
+    staticElement: self::@function::f::@parameter::b
     staticType: bool
   staticElement: <null>
   staticInvokeType: null
@@ -413,12 +413,12 @@
 BinaryExpression
   leftOperand: SimpleIdentifier
     token: a
-    staticElement: a@7
+    staticElement: self::@function::f::@parameter::a
     staticType: bool
   operator: ||
   rightOperand: SimpleIdentifier
     token: b
-    staticElement: b@15
+    staticElement: self::@function::f::@parameter::b
     staticType: bool
   staticElement: <null>
   staticInvokeType: null
@@ -450,12 +450,12 @@
 BinaryExpression
   leftOperand: SimpleIdentifier
     token: a
-    staticElement: a@6
+    staticElement: self::@function::f::@parameter::a
     staticType: int
   operator: -
   rightOperand: SimpleIdentifier
     token: b
-    staticElement: b@16
+    staticElement: self::@function::f::@parameter::b
     staticType: double
   staticElement: dart:core::@class::num::@method::-
   staticInvokeType: num Function(num)
@@ -474,12 +474,12 @@
 BinaryExpression
   leftOperand: SimpleIdentifier
     token: a
-    staticElement: a@6
+    staticElement: self::@function::f::@parameter::a
     staticType: int
   operator: -
   rightOperand: SimpleIdentifier
     token: b
-    staticElement: b@13
+    staticElement: self::@function::f::@parameter::b
     staticType: int
   staticElement: dart:core::@class::num::@method::-
   staticInvokeType: num Function(num)
@@ -511,12 +511,12 @@
 BinaryExpression
   leftOperand: SimpleIdentifier
     token: a
-    staticElement: a@6
+    staticElement: self::@function::f::@parameter::a
     staticType: int
   operator: %
   rightOperand: SimpleIdentifier
     token: b
-    staticElement: b@16
+    staticElement: self::@function::f::@parameter::b
     staticType: double
   staticElement: dart:core::@class::num::@method::%
   staticInvokeType: num Function(num)
@@ -535,12 +535,12 @@
 BinaryExpression
   leftOperand: SimpleIdentifier
     token: a
-    staticElement: a@6
+    staticElement: self::@function::f::@parameter::a
     staticType: int
   operator: %
   rightOperand: SimpleIdentifier
     token: b
-    staticElement: b@13
+    staticElement: self::@function::f::@parameter::b
     staticType: int
   staticElement: dart:core::@class::num::@method::%
   staticInvokeType: num Function(num)
@@ -596,12 +596,12 @@
 BinaryExpression
   leftOperand: SimpleIdentifier
     token: a
-    staticElement: a@9
+    staticElement: self::@function::f::@parameter::a
     staticType: double
   operator: +
   rightOperand: SimpleIdentifier
     token: b
-    staticElement: b@20
+    staticElement: self::@function::f::@parameter::b
     staticType: dynamic
   staticElement: dart:core::@class::double::@method::+
   staticInvokeType: double Function(num)
@@ -687,12 +687,12 @@
 BinaryExpression
   leftOperand: SimpleIdentifier
     token: a
-    staticElement: a@6
+    staticElement: self::@function::f::@parameter::a
     staticType: int
   operator: +
   rightOperand: SimpleIdentifier
     token: b
-    staticElement: b@16
+    staticElement: self::@function::f::@parameter::b
     staticType: double
   staticElement: dart:core::@class::num::@method::+
   staticInvokeType: num Function(num)
@@ -711,12 +711,12 @@
 BinaryExpression
   leftOperand: SimpleIdentifier
     token: a
-    staticElement: a@6
+    staticElement: self::@function::f::@parameter::a
     staticType: int
   operator: +
   rightOperand: SimpleIdentifier
     token: b
-    staticElement: b@17
+    staticElement: self::@function::f::@parameter::b
     staticType: dynamic
   staticElement: dart:core::@class::num::@method::+
   staticInvokeType: num Function(num)
@@ -735,12 +735,12 @@
 BinaryExpression
   leftOperand: SimpleIdentifier
     token: a
-    staticElement: a@6
+    staticElement: self::@function::f::@parameter::a
     staticType: int
   operator: +
   rightOperand: SimpleIdentifier
     token: b
-    staticElement: b@13
+    staticElement: self::@function::f::@parameter::b
     staticType: int
   staticElement: dart:core::@class::num::@method::+
   staticInvokeType: num Function(num)
@@ -760,7 +760,7 @@
   leftOperand: FunctionExpressionInvocation
     function: SimpleIdentifier
       token: a
-      staticElement: a@17
+      staticElement: self::@function::f::@parameter::a
       staticType: int Function()
     argumentList: ArgumentList
       leftParenthesis: (
@@ -771,7 +771,7 @@
   operator: +
   rightOperand: SimpleIdentifier
     token: b
-    staticElement: b@24
+    staticElement: self::@function::f::@parameter::b
     staticType: int
   staticElement: dart:core::@class::num::@method::+
   staticInvokeType: num Function(num)
@@ -801,7 +801,7 @@
       arguments
         SimpleIdentifier
           token: a
-          staticElement: a@66
+          staticElement: self::@function::f::@parameter::a
           staticType: int
       rightParenthesis: )
     extendedType: int
@@ -809,7 +809,7 @@
   operator: +
   rightOperand: SimpleIdentifier
     token: b
-    staticElement: b@73
+    staticElement: self::@function::f::@parameter::b
     staticType: int
   staticElement: self::@extension::E::@method::+
   staticInvokeType: String Function(int)
@@ -828,12 +828,12 @@
 BinaryExpression
   leftOperand: SimpleIdentifier
     token: a
-    staticElement: a@6
+    staticElement: self::@function::f::@parameter::a
     staticType: int
   operator: +
   rightOperand: SimpleIdentifier
     token: b
-    staticElement: b@13
+    staticElement: self::@function::f::@parameter::b
     staticType: num
   staticElement: dart:core::@class::num::@method::+
   staticInvokeType: num Function(num)
@@ -926,12 +926,12 @@
 BinaryExpression
   leftOperand: SimpleIdentifier
     token: a
-    staticElement: a@59
+    staticElement: self::@function::f::@parameter::a
     staticType: A
   operator: +
   rightOperand: SimpleIdentifier
     token: b
-    staticElement: b@69
+    staticElement: self::@function::f::@parameter::b
     staticType: double
   staticElement: self::@class::A::@method::+
   staticInvokeType: String Function(double)
@@ -962,7 +962,7 @@
       arguments
         SimpleIdentifier
           token: a
-          staticElement: a@73
+          staticElement: self::@function::f::@parameter::a
           staticType: A
       rightParenthesis: )
     extendedType: A
@@ -970,7 +970,7 @@
   operator: +
   rightOperand: SimpleIdentifier
     token: b
-    staticElement: b@80
+    staticElement: self::@function::f::@parameter::b
     staticType: int
   staticElement: self::@extension::E::@method::+
   staticInvokeType: String Function(int)
@@ -993,12 +993,12 @@
 BinaryExpression
   leftOperand: SimpleIdentifier
     token: a
-    staticElement: a@73
+    staticElement: self::@function::f::@parameter::a
     staticType: A
   operator: +
   rightOperand: SimpleIdentifier
     token: b
-    staticElement: b@80
+    staticElement: self::@function::f::@parameter::b
     staticType: int
   staticElement: self::@extension::E::@method::+
   staticInvokeType: String Function(int)
@@ -1017,7 +1017,7 @@
 BinaryExpression
   leftOperand: SimpleIdentifier
     token: a
-    staticElement: a@23
+    staticElement: self::@function::f::@parameter::a
     staticType: T
   operator: +
   rightOperand: IntegerLiteral
@@ -1040,7 +1040,7 @@
 BinaryExpression
   leftOperand: SimpleIdentifier
     token: a
-    staticElement: a@19
+    staticElement: self::@function::f::@parameter::a
     staticType: T
   operator: +
   rightOperand: IntegerLiteral
@@ -1063,12 +1063,12 @@
 BinaryExpression
   leftOperand: SimpleIdentifier
     token: a
-    staticElement: a@6
+    staticElement: self::@function::f::@parameter::a
     staticType: int
   operator: /
   rightOperand: SimpleIdentifier
     token: b
-    staticElement: b@13
+    staticElement: self::@function::f::@parameter::b
     staticType: int
   staticElement: dart:core::@class::num::@method::/
   staticInvokeType: double Function(num)
@@ -1100,12 +1100,12 @@
 BinaryExpression
   leftOperand: SimpleIdentifier
     token: a
-    staticElement: a@6
+    staticElement: self::@function::f::@parameter::a
     staticType: int
   operator: *
   rightOperand: SimpleIdentifier
     token: b
-    staticElement: b@16
+    staticElement: self::@function::f::@parameter::b
     staticType: double
   staticElement: dart:core::@class::num::@method::*
   staticInvokeType: num Function(num)
@@ -1124,12 +1124,12 @@
 BinaryExpression
   leftOperand: SimpleIdentifier
     token: a
-    staticElement: a@6
+    staticElement: self::@function::f::@parameter::a
     staticType: int
   operator: *
   rightOperand: SimpleIdentifier
     token: b
-    staticElement: b@13
+    staticElement: self::@function::f::@parameter::b
     staticType: int
   staticElement: dart:core::@class::num::@method::*
   staticInvokeType: num Function(num)
diff --git a/pkg/analyzer/test/src/dart/resolution/comment_test.dart b/pkg/analyzer/test/src/dart/resolution/comment_test.dart
index dba14af..430e5d8 100644
--- a/pkg/analyzer/test/src/dart/resolution/comment_test.dart
+++ b/pkg/analyzer/test/src/dart/resolution/comment_test.dart
@@ -1004,7 +1004,7 @@
 CommentReference
   expression: SimpleIdentifier
     token: p
-    staticElement: p@28
+    staticElement: self::@class::A::@constructor::•::@parameter::p
     staticType: null
 ''');
   }
@@ -1066,7 +1066,7 @@
 CommentReference
   expression: SimpleIdentifier
     token: p
-    staticElement: p@16
+    staticElement: self::@function::foo::@parameter::p
     staticType: null
 ''');
   }
@@ -1147,7 +1147,7 @@
 CommentReference
   expression: SimpleIdentifier
     token: p1
-    staticElement: p1@39
+    staticElement: self::@class::A::@method::ma::@parameter::p1
     staticType: null
 ''');
 
@@ -1155,7 +1155,7 @@
 CommentReference
   expression: SimpleIdentifier
     token: p2
-    staticElement: p2@65
+    staticElement: self::@class::A::@method::mb::@parameter::p2
     staticType: null
 ''');
 
@@ -1163,7 +1163,7 @@
 CommentReference
   expression: SimpleIdentifier
     token: p3
-    staticElement: p3@100
+    staticElement: self::@class::A::@method::mc::@parameter::p3
     staticType: null
 ''');
 
@@ -1179,7 +1179,7 @@
 CommentReference
   expression: SimpleIdentifier
     token: p5
-    staticElement: p5@132
+    staticElement: self::@class::A::@method::md::@parameter::p5
     staticType: null
 ''');
   }
diff --git a/pkg/analyzer/test/src/dart/resolution/extension_method_test.dart b/pkg/analyzer/test/src/dart/resolution/extension_method_test.dart
index 5541ef2..a385e48 100644
--- a/pkg/analyzer/test/src/dart/resolution/extension_method_test.dart
+++ b/pkg/analyzer/test/src/dart/resolution/extension_method_test.dart
@@ -269,7 +269,7 @@
 PrefixedIdentifier
   prefix: SimpleIdentifier
     token: c
-    staticElement: c@35
+    staticElement: self::@function::f::@parameter::c
     staticType: C*
   period: .
   identifier: SimpleIdentifier
@@ -304,7 +304,7 @@
 PrefixedIdentifier
   prefix: SimpleIdentifier
     token: o
-    staticElement: o@50
+    staticElement: self::@function::f::@parameter::o
     staticType: Object*
   period: .
   identifier: SimpleIdentifier
@@ -338,7 +338,7 @@
 PrefixedIdentifier
   prefix: SimpleIdentifier
     token: c
-    staticElement: c@24
+    staticElement: self::@function::f::@parameter::c
     staticType: C*
   period: .
   identifier: SimpleIdentifier
@@ -368,7 +368,7 @@
 PrefixedIdentifier
   prefix: SimpleIdentifier
     token: c
-    staticElement: c@54
+    staticElement: self::@function::f::@parameter::c
     staticType: C*
   period: .
   identifier: SimpleIdentifier
@@ -400,7 +400,7 @@
 PrefixedIdentifier
   prefix: SimpleIdentifier
     token: c
-    staticElement: c@41
+    staticElement: self::@function::f::@parameter::c
     staticType: C*
   period: .
   identifier: SimpleIdentifier
@@ -927,7 +927,7 @@
 PrefixedIdentifier
   prefix: SimpleIdentifier
     token: a
-    staticElement: a@54
+    staticElement: self::@function::f::@parameter::a
     staticType: Never
   period: .
   identifier: SimpleIdentifier
@@ -954,7 +954,7 @@
 PrefixedIdentifier
   prefix: SimpleIdentifier
     token: a
-    staticElement: a@52
+    staticElement: self::@function::f::@parameter::a
     staticType: int?
   period: .
   identifier: SimpleIdentifier
@@ -981,7 +981,7 @@
 PropertyAccess
   target: SimpleIdentifier
     token: a
-    staticElement: a@51
+    staticElement: self::@function::f::@parameter::a
     staticType: int?
   operator: ?.
   propertyName: SimpleIdentifier
@@ -1011,7 +1011,7 @@
 MethodInvocation
   target: SimpleIdentifier
     token: a
-    staticElement: a@50
+    staticElement: self::@function::f::@parameter::a
     staticType: Never
   operator: .
   methodName: SimpleIdentifier
@@ -1041,7 +1041,7 @@
 MethodInvocation
   target: SimpleIdentifier
     token: a
-    staticElement: a@48
+    staticElement: self::@function::f::@parameter::a
     staticType: int?
   operator: .
   methodName: SimpleIdentifier
@@ -1100,7 +1100,7 @@
 MethodInvocation
   target: SimpleIdentifier
     token: a
-    staticElement: a@47
+    staticElement: self::@function::f::@parameter::a
     staticType: int?
   operator: ?.
   methodName: SimpleIdentifier
@@ -1163,7 +1163,7 @@
 BinaryExpression
   leftOperand: SimpleIdentifier
     token: a
-    staticElement: a@70
+    staticElement: self::@function::f::@parameter::a
     staticType: A?
   operator: +
   rightOperand: IntegerLiteral
@@ -1190,7 +1190,7 @@
 IndexExpression
   target: SimpleIdentifier
     token: a
-    staticElement: a@67
+    staticElement: self::@function::f::@parameter::a
     staticType: int?
   leftBracket: [
   index: IntegerLiteral
@@ -1217,7 +1217,7 @@
 IndexExpression
   target: SimpleIdentifier
     token: a
-    staticElement: a@66
+    staticElement: self::@function::f::@parameter::a
     staticType: int?
   leftBracket: [
   index: IntegerLiteral
@@ -1246,12 +1246,12 @@
 PostfixExpression
   operand: SimpleIdentifier
     token: a
-    staticElement: a@72
+    staticElement: self::@function::f::@parameter::a
     staticType: null
   operator: ++
-  readElement: a@72
+  readElement: self::@function::f::@parameter::a
   readType: A?
-  writeElement: a@72
+  writeElement: self::@function::f::@parameter::a
   writeType: A?
   staticElement: self::@extension::E::@method::+
   staticType: A?
@@ -1276,11 +1276,11 @@
   operator: ++
   operand: SimpleIdentifier
     token: a
-    staticElement: a@72
+    staticElement: self::@function::f::@parameter::a
     staticType: null
-  readElement: a@72
+  readElement: self::@function::f::@parameter::a
   readType: A?
-  writeElement: a@72
+  writeElement: self::@function::f::@parameter::a
   writeType: A?
   staticElement: self::@extension::E::@method::+
   staticType: A?
@@ -1305,7 +1305,7 @@
   operator: -
   operand: SimpleIdentifier
     token: a
-    staticElement: a@67
+    staticElement: self::@function::f::@parameter::a
     staticType: A?
   staticElement: self::@extension::E::@method::unary-
   staticType: A?
@@ -1327,7 +1327,7 @@
   leftHandSide: PrefixedIdentifier
     prefix: SimpleIdentifier
       token: a
-      staticElement: a@52
+      staticElement: self::@function::f::@parameter::a
       staticType: int?
     period: .
     identifier: SimpleIdentifier
@@ -1364,7 +1364,7 @@
   leftHandSide: PropertyAccess
     target: SimpleIdentifier
       token: a
-      staticElement: a@51
+      staticElement: self::@function::f::@parameter::a
       staticType: int?
     operator: ?.
     propertyName: SimpleIdentifier
@@ -1427,7 +1427,7 @@
 FunctionExpressionInvocation
   function: SimpleIdentifier
     token: c
-    staticElement: c@87
+    staticElement: self::@function::f::@parameter::c
     staticType: C
   argumentList: ArgumentList
     leftParenthesis: (
@@ -1445,7 +1445,7 @@
 FunctionExpressionInvocation
   function: SimpleIdentifier
     token: c
-    staticElement: c@87
+    staticElement: self::@function::f::@parameter::c
     staticType: C*
   argumentList: ArgumentList
     leftParenthesis: (
@@ -1479,7 +1479,7 @@
 FunctionExpressionInvocation
   function: SimpleIdentifier
     token: c
-    staticElement: c@62
+    staticElement: self::@function::f::@parameter::c
     staticType: C
   argumentList: ArgumentList
     leftParenthesis: (
@@ -1497,7 +1497,7 @@
 FunctionExpressionInvocation
   function: SimpleIdentifier
     token: c
-    staticElement: c@62
+    staticElement: self::@function::f::@parameter::c
     staticType: C*
   argumentList: ArgumentList
     leftParenthesis: (
@@ -1579,15 +1579,15 @@
 AssignmentExpression
   leftHandSide: SimpleIdentifier
     token: c
-    staticElement: c@99
+    staticElement: self::@function::f::@parameter::c
     staticType: null
   operator: +=
   rightHandSide: IntegerLiteral
     literal: 2
     staticType: int
-  readElement: c@99
+  readElement: self::@function::f::@parameter::c
   readType: C
-  writeElement: c@99
+  writeElement: self::@function::f::@parameter::c
   writeType: C
   staticElement: self::@class::C::@method::+
   staticType: C
@@ -1597,15 +1597,15 @@
 AssignmentExpression
   leftHandSide: SimpleIdentifier
     token: c
-    staticElement: c@99
+    staticElement: self::@function::f::@parameter::c
     staticType: null
   operator: +=
   rightHandSide: IntegerLiteral
     literal: 2
     staticType: int*
-  readElement: c@99
+  readElement: self::@function::f::@parameter::c
   readType: C*
-  writeElement: c@99
+  writeElement: self::@function::f::@parameter::c
   writeType: C*
   staticElement: self::@class::C::@method::+
   staticType: C*
@@ -1629,15 +1629,15 @@
 AssignmentExpression
   leftHandSide: SimpleIdentifier
     token: c
-    staticElement: c@67
+    staticElement: self::@function::f::@parameter::c
     staticType: null
   operator: +=
   rightHandSide: IntegerLiteral
     literal: 2
     staticType: int
-  readElement: c@67
+  readElement: self::@function::f::@parameter::c
   readType: C
-  writeElement: c@67
+  writeElement: self::@function::f::@parameter::c
   writeType: C
   staticElement: self::@extension::E::@method::+
   staticType: C
@@ -1647,15 +1647,15 @@
 AssignmentExpression
   leftHandSide: SimpleIdentifier
     token: c
-    staticElement: c@67
+    staticElement: self::@function::f::@parameter::c
     staticType: null
   operator: +=
   rightHandSide: IntegerLiteral
     literal: 2
     staticType: int*
-  readElement: c@67
+  readElement: self::@function::f::@parameter::c
   readType: C*
-  writeElement: c@67
+  writeElement: self::@function::f::@parameter::c
   writeType: C*
   staticElement: self::@extension::E::@method::+
   staticType: C*
@@ -1796,7 +1796,7 @@
 PrefixedIdentifier
   prefix: SimpleIdentifier
     token: f
-    staticElement: f@75
+    staticElement: self::@function::g::@parameter::f
     staticType: int Function(int)
   period: .
   identifier: SimpleIdentifier
@@ -1811,7 +1811,7 @@
 PrefixedIdentifier
   prefix: SimpleIdentifier
     token: f
-    staticElement: f@75
+    staticElement: self::@function::g::@parameter::f
     staticType: int* Function(int*)*
   period: .
   identifier: SimpleIdentifier
@@ -1842,7 +1842,7 @@
 PrefixedIdentifier
   prefix: SimpleIdentifier
     token: c
-    staticElement: c@56
+    staticElement: self::@function::f::@parameter::c
     staticType: C
   period: .
   identifier: SimpleIdentifier
@@ -1857,7 +1857,7 @@
 PrefixedIdentifier
   prefix: SimpleIdentifier
     token: c
-    staticElement: c@56
+    staticElement: self::@function::f::@parameter::c
     staticType: C*
   period: .
   identifier: SimpleIdentifier
@@ -1889,7 +1889,7 @@
   function: PropertyAccess
     target: SimpleIdentifier
       token: c
-      staticElement: c@82
+      staticElement: self::@function::f::@parameter::c
       staticType: C
     operator: .
     propertyName: SimpleIdentifier
@@ -1914,7 +1914,7 @@
   function: PropertyAccess
     target: SimpleIdentifier
       token: c
-      staticElement: c@82
+      staticElement: self::@function::f::@parameter::c
       staticType: C*
     operator: .
     propertyName: SimpleIdentifier
@@ -1958,7 +1958,7 @@
 PrefixedIdentifier
   prefix: SimpleIdentifier
     token: b
-    staticElement: b@124
+    staticElement: self::@function::f::@parameter::b
     staticType: B
   period: .
   identifier: SimpleIdentifier
@@ -1973,7 +1973,7 @@
 PrefixedIdentifier
   prefix: SimpleIdentifier
     token: b
-    staticElement: b@124
+    staticElement: self::@function::f::@parameter::b
     staticType: B*
   period: .
   identifier: SimpleIdentifier
@@ -2002,7 +2002,7 @@
   function: PropertyAccess
     target: SimpleIdentifier
       token: f
-      staticElement: f@97
+      staticElement: self::@function::g::@parameter::f
       staticType: int Function(int)
     operator: .
     propertyName: SimpleIdentifier
@@ -2023,7 +2023,7 @@
   function: PropertyAccess
     target: SimpleIdentifier
       token: f
-      staticElement: f@97
+      staticElement: self::@function::g::@parameter::f
       staticType: int* Function(int*)*
     operator: .
     propertyName: SimpleIdentifier
@@ -2222,7 +2222,7 @@
 MethodInvocation
   target: SimpleIdentifier
     token: f
-    staticElement: f@71
+    staticElement: self::@function::g::@parameter::f
     staticType: int Function(int)
   operator: .
   methodName: SimpleIdentifier
@@ -2240,7 +2240,7 @@
 MethodInvocation
   target: SimpleIdentifier
     token: f
-    staticElement: f@71
+    staticElement: self::@function::g::@parameter::f
     staticType: int* Function(int*)*
   operator: .
   methodName: SimpleIdentifier
@@ -2274,7 +2274,7 @@
 MethodInvocation
   target: SimpleIdentifier
     token: b
-    staticElement: b@52
+    staticElement: self::@function::f::@parameter::b
     staticType: B
   operator: .
   methodName: SimpleIdentifier
@@ -2292,7 +2292,7 @@
 MethodInvocation
   target: SimpleIdentifier
     token: b
-    staticElement: b@52
+    staticElement: self::@function::f::@parameter::b
     staticType: B*
   operator: .
   methodName: SimpleIdentifier
@@ -2331,7 +2331,7 @@
 MethodInvocation
   target: SimpleIdentifier
     token: b
-    staticElement: b@116
+    staticElement: self::@function::f::@parameter::b
     staticType: B
   operator: .
   methodName: SimpleIdentifier
@@ -2349,7 +2349,7 @@
 MethodInvocation
   target: SimpleIdentifier
     token: b
-    staticElement: b@116
+    staticElement: self::@function::f::@parameter::b
     staticType: B*
   operator: .
   methodName: SimpleIdentifier
@@ -2391,7 +2391,7 @@
 MethodInvocation
   target: SimpleIdentifier
     token: x
-    staticElement: x@160
+    staticElement: self::@function::f::@parameter::x
     staticType: B<C>
   operator: .
   methodName: SimpleIdentifier
@@ -2405,7 +2405,7 @@
     arguments
       SimpleIdentifier
         token: o
-        staticElement: o@165
+        staticElement: self::@function::f::@parameter::o
         staticType: C
     rightParenthesis: )
   staticInvokeType: void Function(C)
@@ -2416,7 +2416,7 @@
 MethodInvocation
   target: SimpleIdentifier
     token: x
-    staticElement: x@160
+    staticElement: self::@function::f::@parameter::x
     staticType: B<C*>*
   operator: .
   methodName: SimpleIdentifier
@@ -2430,7 +2430,7 @@
     arguments
       SimpleIdentifier
         token: o
-        staticElement: o@165
+        staticElement: self::@function::f::@parameter::o
         staticType: C*
     rightParenthesis: )
   staticInvokeType: void Function(C*)*
@@ -2457,7 +2457,7 @@
 BinaryExpression
   leftOperand: SimpleIdentifier
     token: c
-    staticElement: c@93
+    staticElement: self::@function::f::@parameter::c
     staticType: C
   operator: +
   rightOperand: IntegerLiteral
@@ -2472,7 +2472,7 @@
 BinaryExpression
   leftOperand: SimpleIdentifier
     token: c
-    staticElement: c@93
+    staticElement: self::@function::f::@parameter::c
     staticType: C*
   operator: +
   rightOperand: IntegerLiteral
@@ -2500,7 +2500,7 @@
 BinaryExpression
   leftOperand: SimpleIdentifier
     token: f
-    staticElement: f@85
+    staticElement: self::@function::g::@parameter::f
     staticType: int Function(int)
   operator: +
   rightOperand: IntegerLiteral
@@ -2515,7 +2515,7 @@
 BinaryExpression
   leftOperand: SimpleIdentifier
     token: f
-    staticElement: f@85
+    staticElement: self::@function::g::@parameter::f
     staticType: int* Function(int*)*
   operator: +
   rightOperand: IntegerLiteral
@@ -2544,7 +2544,7 @@
 BinaryExpression
   leftOperand: SimpleIdentifier
     token: c
-    staticElement: c@64
+    staticElement: self::@function::f::@parameter::c
     staticType: C
   operator: +
   rightOperand: IntegerLiteral
@@ -2559,7 +2559,7 @@
 BinaryExpression
   leftOperand: SimpleIdentifier
     token: c
-    staticElement: c@64
+    staticElement: self::@function::f::@parameter::c
     staticType: C*
   operator: +
   rightOperand: IntegerLiteral
@@ -2601,7 +2601,7 @@
 IndexExpression
   target: SimpleIdentifier
     token: c
-    staticElement: c@103
+    staticElement: self::@function::f::@parameter::c
     staticType: C
   leftBracket: [
   index: IntegerLiteral
@@ -2616,7 +2616,7 @@
 IndexExpression
   target: SimpleIdentifier
     token: c
-    staticElement: c@103
+    staticElement: self::@function::f::@parameter::c
     staticType: C*
   leftBracket: [
   index: IntegerLiteral
@@ -2644,7 +2644,7 @@
 IndexExpression
   target: SimpleIdentifier
     token: f
-    staticElement: f@90
+    staticElement: self::@function::g::@parameter::f
     staticType: int Function(int)
   leftBracket: [
   index: IntegerLiteral
@@ -2659,7 +2659,7 @@
 IndexExpression
   target: SimpleIdentifier
     token: f
-    staticElement: f@90
+    staticElement: self::@function::g::@parameter::f
     staticType: int* Function(int*)*
   leftBracket: [
   index: IntegerLiteral
@@ -2688,7 +2688,7 @@
 IndexExpression
   target: SimpleIdentifier
     token: c
-    staticElement: c@69
+    staticElement: self::@function::f::@parameter::c
     staticType: C
   leftBracket: [
   index: IntegerLiteral
@@ -2703,7 +2703,7 @@
 IndexExpression
   target: SimpleIdentifier
     token: c
-    staticElement: c@69
+    staticElement: self::@function::f::@parameter::c
     staticType: C*
   leftBracket: [
   index: IntegerLiteral
@@ -2735,7 +2735,7 @@
   leftHandSide: IndexExpression
     target: SimpleIdentifier
       token: c
-      staticElement: c@127
+      staticElement: self::@function::f::@parameter::c
       staticType: C
     leftBracket: [
     index: IntegerLiteral
@@ -2761,7 +2761,7 @@
   leftHandSide: IndexExpression
     target: SimpleIdentifier
       token: c
-      staticElement: c@127
+      staticElement: self::@function::f::@parameter::c
       staticType: C*
     leftBracket: [
     index: IntegerLiteral
@@ -2800,7 +2800,7 @@
   leftHandSide: IndexExpression
     target: SimpleIdentifier
       token: f
-      staticElement: f@102
+      staticElement: self::@function::g::@parameter::f
       staticType: int Function(int)
     leftBracket: [
     index: IntegerLiteral
@@ -2826,7 +2826,7 @@
   leftHandSide: IndexExpression
     target: SimpleIdentifier
       token: f
-      staticElement: f@102
+      staticElement: self::@function::g::@parameter::f
       staticType: int* Function(int*)*
     leftBracket: [
     index: IntegerLiteral
@@ -2866,7 +2866,7 @@
   leftHandSide: IndexExpression
     target: SimpleIdentifier
       token: c
-      staticElement: c@81
+      staticElement: self::@function::f::@parameter::c
       staticType: C
     leftBracket: [
     index: IntegerLiteral
@@ -2892,7 +2892,7 @@
   leftHandSide: IndexExpression
     target: SimpleIdentifier
       token: c
-      staticElement: c@81
+      staticElement: self::@function::f::@parameter::c
       staticType: C*
     leftBracket: [
     index: IntegerLiteral
@@ -2933,12 +2933,12 @@
 PostfixExpression
   operand: SimpleIdentifier
     token: c
-    staticElement: c@99
+    staticElement: self::@function::f::@parameter::c
     staticType: null
   operator: ++
-  readElement: c@99
+  readElement: self::@function::f::@parameter::c
   readType: C
-  writeElement: c@99
+  writeElement: self::@function::f::@parameter::c
   writeType: C
   staticElement: self::@class::C::@method::+
   staticType: C
@@ -2948,12 +2948,12 @@
 PostfixExpression
   operand: SimpleIdentifier
     token: c
-    staticElement: c@99
+    staticElement: self::@function::f::@parameter::c
     staticType: null
   operator: ++
-  readElement: c@99
+  readElement: self::@function::f::@parameter::c
   readType: C*
-  writeElement: c@99
+  writeElement: self::@function::f::@parameter::c
   writeType: C*
   staticElement: self::@class::C::@method::+
   staticType: C*
@@ -2976,12 +2976,12 @@
 PostfixExpression
   operand: SimpleIdentifier
     token: f
-    staticElement: f@104
+    staticElement: self::@function::g::@parameter::f
     staticType: null
   operator: ++
-  readElement: f@104
+  readElement: self::@function::g::@parameter::f
   readType: int Function(int)
-  writeElement: f@104
+  writeElement: self::@function::g::@parameter::f
   writeType: int Function(int)
   staticElement: self::@extension::E::@method::+
   staticType: int Function(int)
@@ -2991,12 +2991,12 @@
 PostfixExpression
   operand: SimpleIdentifier
     token: f
-    staticElement: f@104
+    staticElement: self::@function::g::@parameter::f
     staticType: null
   operator: ++
-  readElement: f@104
+  readElement: self::@function::g::@parameter::f
   readType: int* Function(int*)*
-  writeElement: f@104
+  writeElement: self::@function::g::@parameter::f
   writeType: int* Function(int*)*
   staticElement: self::@extension::E::@method::+
   staticType: int* Function(int*)*
@@ -3020,12 +3020,12 @@
 PostfixExpression
   operand: SimpleIdentifier
     token: c
-    staticElement: c@67
+    staticElement: self::@function::f::@parameter::c
     staticType: null
   operator: ++
-  readElement: c@67
+  readElement: self::@function::f::@parameter::c
   readType: C
-  writeElement: c@67
+  writeElement: self::@function::f::@parameter::c
   writeType: C
   staticElement: self::@extension::E::@method::+
   staticType: C
@@ -3035,12 +3035,12 @@
 PostfixExpression
   operand: SimpleIdentifier
     token: c
-    staticElement: c@67
+    staticElement: self::@function::f::@parameter::c
     staticType: null
   operator: ++
-  readElement: c@67
+  readElement: self::@function::f::@parameter::c
   readType: C*
-  writeElement: c@67
+  writeElement: self::@function::f::@parameter::c
   writeType: C*
   staticElement: self::@extension::E::@method::+
   staticType: C*
@@ -3067,11 +3067,11 @@
   operator: ++
   operand: SimpleIdentifier
     token: c
-    staticElement: c@99
+    staticElement: self::@function::f::@parameter::c
     staticType: null
-  readElement: c@99
+  readElement: self::@function::f::@parameter::c
   readType: C
-  writeElement: c@99
+  writeElement: self::@function::f::@parameter::c
   writeType: C
   staticElement: self::@class::C::@method::+
   staticType: C
@@ -3082,11 +3082,11 @@
   operator: ++
   operand: SimpleIdentifier
     token: c
-    staticElement: c@99
+    staticElement: self::@function::f::@parameter::c
     staticType: null
-  readElement: c@99
+  readElement: self::@function::f::@parameter::c
   readType: C*
-  writeElement: c@99
+  writeElement: self::@function::f::@parameter::c
   writeType: C*
   staticElement: self::@class::C::@method::+
   staticType: C*
@@ -3110,11 +3110,11 @@
   operator: ++
   operand: SimpleIdentifier
     token: f
-    staticElement: f@104
+    staticElement: self::@function::g::@parameter::f
     staticType: null
-  readElement: f@104
+  readElement: self::@function::g::@parameter::f
   readType: int Function(int)
-  writeElement: f@104
+  writeElement: self::@function::g::@parameter::f
   writeType: int Function(int)
   staticElement: self::@extension::E::@method::+
   staticType: int Function(int)
@@ -3125,11 +3125,11 @@
   operator: ++
   operand: SimpleIdentifier
     token: f
-    staticElement: f@104
+    staticElement: self::@function::g::@parameter::f
     staticType: null
-  readElement: f@104
+  readElement: self::@function::g::@parameter::f
   readType: int* Function(int*)*
-  writeElement: f@104
+  writeElement: self::@function::g::@parameter::f
   writeType: int* Function(int*)*
   staticElement: self::@extension::E::@method::+
   staticType: int* Function(int*)*
@@ -3154,11 +3154,11 @@
   operator: ++
   operand: SimpleIdentifier
     token: c
-    staticElement: c@67
+    staticElement: self::@function::f::@parameter::c
     staticType: null
-  readElement: c@67
+  readElement: self::@function::f::@parameter::c
   readType: C
-  writeElement: c@67
+  writeElement: self::@function::f::@parameter::c
   writeType: C
   staticElement: self::@extension::E::@method::+
   staticType: C
@@ -3169,11 +3169,11 @@
   operator: ++
   operand: SimpleIdentifier
     token: c
-    staticElement: c@67
+    staticElement: self::@function::f::@parameter::c
     staticType: null
-  readElement: c@67
+  readElement: self::@function::f::@parameter::c
   readType: C*
-  writeElement: c@67
+  writeElement: self::@function::f::@parameter::c
   writeType: C*
   staticElement: self::@extension::E::@method::+
   staticType: C*
@@ -3200,7 +3200,7 @@
   operator: -
   operand: SimpleIdentifier
     token: c
-    staticElement: c@89
+    staticElement: self::@function::f::@parameter::c
     staticType: C
   staticElement: self::@class::C::@method::unary-
   staticType: C
@@ -3211,7 +3211,7 @@
   operator: -
   operand: SimpleIdentifier
     token: c
-    staticElement: c@89
+    staticElement: self::@function::f::@parameter::c
     staticType: C*
   staticElement: self::@class::C::@method::unary-
   staticType: C*
@@ -3235,7 +3235,7 @@
   operator: -
   operand: SimpleIdentifier
     token: f
-    staticElement: f@80
+    staticElement: self::@function::g::@parameter::f
     staticType: int Function(int)
   staticElement: self::@extension::E::@method::unary-
   staticType: void
@@ -3246,7 +3246,7 @@
   operator: -
   operand: SimpleIdentifier
     token: f
-    staticElement: f@80
+    staticElement: self::@function::g::@parameter::f
     staticType: int* Function(int*)*
   staticElement: self::@extension::E::@method::unary-
   staticType: void
@@ -3271,7 +3271,7 @@
   operator: -
   operand: SimpleIdentifier
     token: c
-    staticElement: c@62
+    staticElement: self::@function::f::@parameter::c
     staticType: C
   staticElement: self::@extension::E::@method::unary-
   staticType: C
@@ -3282,7 +3282,7 @@
   operator: -
   operand: SimpleIdentifier
     token: c
-    staticElement: c@62
+    staticElement: self::@function::f::@parameter::c
     staticType: C*
   staticElement: self::@extension::E::@method::unary-
   staticType: C*
@@ -3306,7 +3306,7 @@
   leftHandSide: PrefixedIdentifier
     prefix: SimpleIdentifier
       token: f
-      staticElement: f@75
+      staticElement: self::@function::g::@parameter::f
       staticType: int Function(int)
     period: .
     identifier: SimpleIdentifier
@@ -3332,7 +3332,7 @@
   leftHandSide: PrefixedIdentifier
     prefix: SimpleIdentifier
       token: f
-      staticElement: f@75
+      staticElement: self::@function::g::@parameter::f
       staticType: int* Function(int*)*
     period: .
     identifier: SimpleIdentifier
@@ -3374,7 +3374,7 @@
   leftHandSide: PrefixedIdentifier
     prefix: SimpleIdentifier
       token: c
-      staticElement: c@56
+      staticElement: self::@function::f::@parameter::c
       staticType: C
     period: .
     identifier: SimpleIdentifier
@@ -3400,7 +3400,7 @@
   leftHandSide: PrefixedIdentifier
     prefix: SimpleIdentifier
       token: c
-      staticElement: c@56
+      staticElement: self::@function::f::@parameter::c
       staticType: C*
     period: .
     identifier: SimpleIdentifier
@@ -3436,7 +3436,7 @@
 PrefixedIdentifier
   prefix: SimpleIdentifier
     token: f
-    staticElement: f@76
+    staticElement: self::@function::g::@parameter::f
     staticType: int Function(int)
   period: .
   identifier: SimpleIdentifier
@@ -3451,7 +3451,7 @@
 PrefixedIdentifier
   prefix: SimpleIdentifier
     token: f
-    staticElement: f@76
+    staticElement: self::@function::g::@parameter::f
     staticType: int* Function(int*)*
   period: .
   identifier: SimpleIdentifier
@@ -3480,7 +3480,7 @@
 PrefixedIdentifier
   prefix: SimpleIdentifier
     token: c
-    staticElement: c@57
+    staticElement: self::@function::f::@parameter::c
     staticType: C
   period: .
   identifier: SimpleIdentifier
@@ -3495,7 +3495,7 @@
 PrefixedIdentifier
   prefix: SimpleIdentifier
     token: c
-    staticElement: c@57
+    staticElement: self::@function::f::@parameter::c
     staticType: C*
   period: .
   identifier: SimpleIdentifier
diff --git a/pkg/analyzer/test/src/dart/resolution/extension_override_test.dart b/pkg/analyzer/test/src/dart/resolution/extension_override_test.dart
index b51bd96..de64c30 100644
--- a/pkg/analyzer/test/src/dart/resolution/extension_override_test.dart
+++ b/pkg/analyzer/test/src/dart/resolution/extension_override_test.dart
@@ -40,7 +40,7 @@
       arguments
         SimpleIdentifier
           token: a
-          staticElement: a@71
+          staticElement: self::@function::f::@parameter::a
           staticType: int?
       rightParenthesis: )
     extendedType: int
@@ -79,7 +79,7 @@
         arguments
           SimpleIdentifier
             token: a
-            staticElement: a@76
+            staticElement: self::@function::f::@parameter::a
             staticType: int?
         rightParenthesis: )
       extendedType: int
@@ -128,7 +128,7 @@
       arguments
         SimpleIdentifier
           token: a
-          staticElement: a@54
+          staticElement: self::@function::f::@parameter::a
           staticType: int?
       rightParenthesis: )
     extendedType: int
@@ -203,7 +203,7 @@
       arguments
         SimpleIdentifier
           token: a
-          staticElement: a@68
+          staticElement: self::@function::f::@parameter::a
           staticType: A
       rightParenthesis: )
     extendedType: A
@@ -231,7 +231,7 @@
       arguments
         SimpleIdentifier
           token: a
-          staticElement: a@68
+          staticElement: self::@function::f::@parameter::a
           staticType: A*
       rightParenthesis: )
     extendedType: A*
@@ -285,7 +285,7 @@
       arguments
         SimpleIdentifier
           token: a
-          staticElement: a@66
+          staticElement: self::@function::f::@parameter::a
           staticType: A
       rightParenthesis: )
     extendedType: A
@@ -327,7 +327,7 @@
       arguments
         SimpleIdentifier
           token: a
-          staticElement: a@66
+          staticElement: self::@function::f::@parameter::a
           staticType: A*
       rightParenthesis: )
     extendedType: A*
@@ -385,7 +385,7 @@
       arguments
         SimpleIdentifier
           token: a
-          staticElement: a@35
+          staticElement: self::@function::f::@parameter::a
           staticType: A
       rightParenthesis: )
     extendedType: A
@@ -421,7 +421,7 @@
       arguments
         SimpleIdentifier
           token: a
-          staticElement: a@35
+          staticElement: self::@function::f::@parameter::a
           staticType: A*
       rightParenthesis: )
     extendedType: A*
@@ -486,7 +486,7 @@
       arguments
         SimpleIdentifier
           token: a
-          staticElement: a@35
+          staticElement: self::@function::f::@parameter::a
           staticType: A
       rightParenthesis: )
     extendedType: A
@@ -536,7 +536,7 @@
       arguments
         SimpleIdentifier
           token: a
-          staticElement: a@35
+          staticElement: self::@function::f::@parameter::a
           staticType: A*
       rightParenthesis: )
     extendedType: A*
@@ -583,7 +583,7 @@
       arguments
         SimpleIdentifier
           token: a
-          staticElement: a@59
+          staticElement: self::@function::f::@parameter::a
           staticType: A
       rightParenthesis: )
     extendedType: A
@@ -608,7 +608,7 @@
       arguments
         SimpleIdentifier
           token: a
-          staticElement: a@59
+          staticElement: self::@function::f::@parameter::a
           staticType: A*
       rightParenthesis: )
     extendedType: A*
@@ -651,7 +651,7 @@
         arguments
           SimpleIdentifier
             token: a
-            staticElement: a@87
+            staticElement: self::@function::f::@parameter::a
             staticType: A
         rightParenthesis: )
       extendedType: A
@@ -687,7 +687,7 @@
         arguments
           SimpleIdentifier
             token: a
-            staticElement: a@87
+            staticElement: self::@function::f::@parameter::a
             staticType: A*
         rightParenthesis: )
       extendedType: A*
@@ -747,7 +747,7 @@
       arguments
         SimpleIdentifier
           token: a
-          staticElement: a@62
+          staticElement: self::@function::f::@parameter::a
           staticType: A
       rightParenthesis: )
     extendedType: A
@@ -786,7 +786,7 @@
       arguments
         SimpleIdentifier
           token: a
-          staticElement: a@62
+          staticElement: self::@function::f::@parameter::a
           staticType: A*
       rightParenthesis: )
     extendedType: A*
@@ -841,7 +841,7 @@
       arguments
         SimpleIdentifier
           token: a
-          staticElement: a@35
+          staticElement: self::@function::f::@parameter::a
           staticType: A
       rightParenthesis: )
     extendedType: A
@@ -874,7 +874,7 @@
       arguments
         SimpleIdentifier
           token: a
-          staticElement: a@35
+          staticElement: self::@function::f::@parameter::a
           staticType: A*
       rightParenthesis: )
     extendedType: A*
@@ -935,7 +935,7 @@
       arguments
         SimpleIdentifier
           token: a
-          staticElement: a@35
+          staticElement: self::@function::f::@parameter::a
           staticType: A
       rightParenthesis: )
     extendedType: A
@@ -982,7 +982,7 @@
       arguments
         SimpleIdentifier
           token: a
-          staticElement: a@35
+          staticElement: self::@function::f::@parameter::a
           staticType: A*
       rightParenthesis: )
     extendedType: A*
@@ -1026,7 +1026,7 @@
       arguments
         SimpleIdentifier
           token: a
-          staticElement: a@55
+          staticElement: self::@function::f::@parameter::a
           staticType: A
       rightParenthesis: )
     extendedType: A
@@ -1055,7 +1055,7 @@
       arguments
         SimpleIdentifier
           token: a
-          staticElement: a@55
+          staticElement: self::@function::f::@parameter::a
           staticType: A*
       rightParenthesis: )
     extendedType: A*
@@ -1109,7 +1109,7 @@
       arguments
         SimpleIdentifier
           token: a
-          staticElement: a@58
+          staticElement: self::@function::f::@parameter::a
           staticType: A
       rightParenthesis: )
     extendedType: A
@@ -1152,7 +1152,7 @@
       arguments
         SimpleIdentifier
           token: a
-          staticElement: a@58
+          staticElement: self::@function::f::@parameter::a
           staticType: A*
       rightParenthesis: )
     extendedType: A*
@@ -1211,7 +1211,7 @@
       arguments
         SimpleIdentifier
           token: a
-          staticElement: a@35
+          staticElement: self::@function::f::@parameter::a
           staticType: A
       rightParenthesis: )
     extendedType: A
@@ -1248,7 +1248,7 @@
       arguments
         SimpleIdentifier
           token: a
-          staticElement: a@35
+          staticElement: self::@function::f::@parameter::a
           staticType: A*
       rightParenthesis: )
     extendedType: A*
@@ -1313,7 +1313,7 @@
       arguments
         SimpleIdentifier
           token: a
-          staticElement: a@35
+          staticElement: self::@function::f::@parameter::a
           staticType: A
       rightParenthesis: )
     extendedType: A
@@ -1364,7 +1364,7 @@
       arguments
         SimpleIdentifier
           token: a
-          staticElement: a@35
+          staticElement: self::@function::f::@parameter::a
           staticType: A*
       rightParenthesis: )
     extendedType: A*
@@ -1412,7 +1412,7 @@
       arguments
         SimpleIdentifier
           token: a
-          staticElement: a@74
+          staticElement: self::@function::f::@parameter::a
           staticType: A
       rightParenthesis: )
     extendedType: A
@@ -1438,7 +1438,7 @@
       arguments
         SimpleIdentifier
           token: a
-          staticElement: a@74
+          staticElement: self::@function::f::@parameter::a
           staticType: A*
       rightParenthesis: )
     extendedType: A*
@@ -1489,7 +1489,7 @@
       arguments
         SimpleIdentifier
           token: a
-          staticElement: a@77
+          staticElement: self::@function::f::@parameter::a
           staticType: A
       rightParenthesis: )
     extendedType: A
@@ -1527,7 +1527,7 @@
       arguments
         SimpleIdentifier
           token: a
-          staticElement: a@77
+          staticElement: self::@function::f::@parameter::a
           staticType: A*
       rightParenthesis: )
     extendedType: A*
@@ -1663,7 +1663,7 @@
       arguments
         SimpleIdentifier
           token: a
-          staticElement: a@35
+          staticElement: self::@function::f::@parameter::a
           staticType: A
       rightParenthesis: )
     extendedType: A
@@ -1697,7 +1697,7 @@
       arguments
         SimpleIdentifier
           token: a
-          staticElement: a@35
+          staticElement: self::@function::f::@parameter::a
           staticType: A*
       rightParenthesis: )
     extendedType: A*
@@ -1759,7 +1759,7 @@
       arguments
         SimpleIdentifier
           token: a
-          staticElement: a@35
+          staticElement: self::@function::f::@parameter::a
           staticType: A
       rightParenthesis: )
     extendedType: A
@@ -1805,7 +1805,7 @@
       arguments
         SimpleIdentifier
           token: a
-          staticElement: a@35
+          staticElement: self::@function::f::@parameter::a
           staticType: A*
       rightParenthesis: )
     extendedType: A*
@@ -1849,7 +1849,7 @@
         arguments
           SimpleIdentifier
             token: a
-            staticElement: a@59
+            staticElement: self::@function::f::@parameter::a
             staticType: A
         rightParenthesis: )
       extendedType: A
@@ -1885,7 +1885,7 @@
         arguments
           SimpleIdentifier
             token: a
-            staticElement: a@59
+            staticElement: self::@function::f::@parameter::a
             staticType: A*
         rightParenthesis: )
       extendedType: A*
@@ -1946,7 +1946,7 @@
         arguments
           SimpleIdentifier
             token: a
-            staticElement: a@62
+            staticElement: self::@function::f::@parameter::a
             staticType: A
         rightParenthesis: )
       extendedType: A
@@ -1996,7 +1996,7 @@
         arguments
           SimpleIdentifier
             token: a
-            staticElement: a@62
+            staticElement: self::@function::f::@parameter::a
             staticType: A*
         rightParenthesis: )
       extendedType: A*
@@ -2062,7 +2062,7 @@
         arguments
           SimpleIdentifier
             token: a
-            staticElement: a@35
+            staticElement: self::@function::f::@parameter::a
             staticType: A
         rightParenthesis: )
       extendedType: A
@@ -2106,7 +2106,7 @@
         arguments
           SimpleIdentifier
             token: a
-            staticElement: a@35
+            staticElement: self::@function::f::@parameter::a
             staticType: A*
         rightParenthesis: )
       extendedType: A*
@@ -2178,7 +2178,7 @@
         arguments
           SimpleIdentifier
             token: a
-            staticElement: a@35
+            staticElement: self::@function::f::@parameter::a
             staticType: A
         rightParenthesis: )
       extendedType: A
@@ -2236,7 +2236,7 @@
         arguments
           SimpleIdentifier
             token: a
-            staticElement: a@35
+            staticElement: self::@function::f::@parameter::a
             staticType: A*
         rightParenthesis: )
       extendedType: A*
@@ -2292,7 +2292,7 @@
         arguments
           SimpleIdentifier
             token: a
-            staticElement: a@77
+            staticElement: self::@function::f::@parameter::a
             staticType: A
         rightParenthesis: )
       extendedType: A
@@ -2328,7 +2328,7 @@
         arguments
           SimpleIdentifier
             token: a
-            staticElement: a@77
+            staticElement: self::@function::f::@parameter::a
             staticType: A*
         rightParenthesis: )
       extendedType: A*
@@ -2392,7 +2392,7 @@
         arguments
           SimpleIdentifier
             token: a
-            staticElement: a@80
+            staticElement: self::@function::f::@parameter::a
             staticType: A
         rightParenthesis: )
       extendedType: A
@@ -2444,7 +2444,7 @@
         arguments
           SimpleIdentifier
             token: a
-            staticElement: a@80
+            staticElement: self::@function::f::@parameter::a
             staticType: A*
         rightParenthesis: )
       extendedType: A*
@@ -2515,7 +2515,7 @@
         arguments
           SimpleIdentifier
             token: a
-            staticElement: a@35
+            staticElement: self::@function::f::@parameter::a
             staticType: A
         rightParenthesis: )
       extendedType: A
@@ -2559,7 +2559,7 @@
         arguments
           SimpleIdentifier
             token: a
-            staticElement: a@35
+            staticElement: self::@function::f::@parameter::a
             staticType: A*
         rightParenthesis: )
       extendedType: A*
@@ -2634,7 +2634,7 @@
         arguments
           SimpleIdentifier
             token: a
-            staticElement: a@35
+            staticElement: self::@function::f::@parameter::a
             staticType: A
         rightParenthesis: )
       extendedType: A
@@ -2694,7 +2694,7 @@
         arguments
           SimpleIdentifier
             token: a
-            staticElement: a@35
+            staticElement: self::@function::f::@parameter::a
             staticType: A*
         rightParenthesis: )
       extendedType: A*
@@ -2752,7 +2752,7 @@
       arguments
         SimpleIdentifier
           token: c
-          staticElement: c@57
+          staticElement: self::@function::f::@parameter::c
           staticType: C
       rightParenthesis: )
     extendedType: C
@@ -2777,7 +2777,7 @@
       arguments
         SimpleIdentifier
           token: c
-          staticElement: c@57
+          staticElement: self::@function::f::@parameter::c
           staticType: C*
       rightParenthesis: )
     extendedType: C*
diff --git a/pkg/analyzer/test/src/dart/resolution/function_reference_test.dart b/pkg/analyzer/test/src/dart/resolution/function_reference_test.dart
index 0e11f6c..1ef7367 100644
--- a/pkg/analyzer/test/src/dart/resolution/function_reference_test.dart
+++ b/pkg/analyzer/test/src/dart/resolution/function_reference_test.dart
@@ -37,7 +37,7 @@
       expression: AsExpression
         expression: SimpleIdentifier
           token: f
-          staticElement: f@43
+          staticElement: self::@function::foo::@parameter::f
           staticType: void Function<T>(T)
         asOperator: as
         type: NamedType
@@ -113,7 +113,7 @@
     operator: =
     rightHandSide: SimpleIdentifier
       token: f
-      staticElement: f@71
+      staticElement: self::@function::foo::@parameter::f
       staticType: void Function<T>(T)
     readElement: <null>
     readType: null
@@ -145,15 +145,15 @@
   function: AssignmentExpression
     leftHandSide: SimpleIdentifier
       token: f
-      staticElement: f@144
+      staticElement: self::@function::foo::@parameter::f
       staticType: null
     operator: +=
     rightHandSide: IntegerLiteral
       literal: 1
       staticType: int
-    readElement: f@144
+    readElement: self::@function::foo::@parameter::f
     readType: void Function<T>(T)
-    writeElement: f@144
+    writeElement: self::@function::foo::@parameter::f
     writeType: void Function<T>(T)
     staticElement: self::@extension::0::@method::+
     staticType: void Function<T>(T)
@@ -176,7 +176,7 @@
     awaitKeyword: await
     expression: SimpleIdentifier
       token: f
-      staticElement: f@59
+      staticElement: self::@function::foo::@parameter::f
       staticType: Future<void Function<T>(T)>
     staticType: void Function<T>(T)
   staticType: void Function(int)
@@ -203,7 +203,7 @@
   function: BinaryExpression
     leftOperand: SimpleIdentifier
       token: c
-      staticElement: c@108
+      staticElement: self::@function::foo::@parameter::c
       staticType: C
     operator: +
     rightOperand: IntegerLiteral
@@ -229,7 +229,7 @@
 FunctionReference
   function: SimpleIdentifier
     token: f
-    staticElement: f@43
+    staticElement: self::@function::foo::@parameter::f
     staticType: void Function<T>(T)
   staticType: void Function(int)
   typeArgumentTypes
@@ -301,9 +301,9 @@
           type: T
         identifier: SimpleIdentifier
           token: a
-          staticElement: a@42
+          staticElement: @36::@parameter::a
           staticType: null
-        declaredElement: a@42
+        declaredElement: @36::@parameter::a
         declaredElementType: T
       rightParenthesis: )
     body: BlockFunctionBody
@@ -332,7 +332,7 @@
       leftParenthesis: (
       expression: SimpleIdentifier
         token: f
-        staticElement: f@54
+        staticElement: self::@function::foo::@parameter::f
         staticType: void Function<T>(T) Function()
       rightParenthesis: )
       staticType: void Function<T>(T) Function()
@@ -361,7 +361,7 @@
 FunctionReference
   function: SimpleIdentifier
     token: f
-    staticElement: f@61
+    staticElement: self::@function::foo::@parameter::f
     staticType: void Function<U>(U)
       alias: self::@typeAlias::Fn
   staticType: void Function(int)
@@ -397,7 +397,7 @@
   function: IndexExpression
     target: SimpleIdentifier
       token: f
-      staticElement: f@49
+      staticElement: self::@function::foo::@parameter::f
       staticType: List<void Function<T>(T)>
     leftBracket: [
     index: IntegerLiteral
@@ -431,7 +431,7 @@
   function: MethodInvocation
     target: SimpleIdentifier
       token: c
-      staticElement: c@100
+      staticElement: self::@function::foo::@parameter::c
       staticType: C
     operator: .
     methodName: SimpleIdentifier
@@ -467,12 +467,12 @@
   function: PostfixExpression
     operand: SimpleIdentifier
       token: f
-      staticElement: f@144
+      staticElement: self::@function::foo::@parameter::f
       staticType: null
     operator: ++
-    readElement: f@144
+    readElement: self::@function::foo::@parameter::f
     readType: void Function<T>(T)
-    writeElement: f@144
+    writeElement: self::@function::foo::@parameter::f
     writeType: void Function<T>(T)
     staticElement: self::@extension::0::@method::+
     staticType: void Function<T>(T)
@@ -498,7 +498,7 @@
   function: PrefixedIdentifier
     prefix: SimpleIdentifier
       token: c
-      staticElement: c@68
+      staticElement: self::@function::foo::@parameter::c
       staticType: C
     period: .
     identifier: SimpleIdentifier
@@ -532,11 +532,11 @@
     operator: ++
     operand: SimpleIdentifier
       token: f
-      staticElement: f@144
+      staticElement: self::@function::foo::@parameter::f
       staticType: null
-    readElement: f@144
+    readElement: self::@function::foo::@parameter::f
     readType: void Function<T>(T)
-    writeElement: f@144
+    writeElement: self::@function::foo::@parameter::f
     writeType: void Function<T>(T)
     staticElement: self::@extension::0::@method::+
     staticType: void Function<T>(T)
@@ -564,7 +564,7 @@
       leftParenthesis: (
       expression: SimpleIdentifier
         token: c
-        staticElement: c@68
+        staticElement: self::@function::foo::@parameter::c
         staticType: C
       rightParenthesis: )
       staticType: C
@@ -591,7 +591,7 @@
 FunctionReference
   function: SimpleIdentifier
     token: f
-    staticElement: f@43
+    staticElement: self::@function::foo::@parameter::f
     staticType: void Function<T>(T)
   staticType: void Function(int)
   typeArgumentTypes
@@ -1089,7 +1089,7 @@
         arguments
           SimpleIdentifier
             token: a
-            staticElement: a@60
+            staticElement: self::@function::bar::@parameter::a
             staticType: A
         rightParenthesis: )
       extendedType: A
@@ -1221,7 +1221,7 @@
         arguments
           SimpleIdentifier
             token: a
-            staticElement: a@78
+            staticElement: self::@function::bar::@parameter::a
             staticType: A
         rightParenthesis: )
       extendedType: A
@@ -1321,7 +1321,7 @@
         arguments
           SimpleIdentifier
             token: a
-            staticElement: a@69
+            staticElement: self::@function::bar::@parameter::a
             staticType: A
         rightParenthesis: )
       extendedType: A
@@ -1374,7 +1374,7 @@
         arguments
           SimpleIdentifier
             token: a
-            staticElement: a@39
+            staticElement: self::@function::bar::@parameter::a
             staticType: A
         rightParenthesis: )
       extendedType: A
@@ -1932,7 +1932,7 @@
   function: PrefixedIdentifier
     prefix: SimpleIdentifier
       token: a
-      staticElement: a@51
+      staticElement: self::@function::bar::@parameter::a
       staticType: A
     period: .
     identifier: SimpleIdentifier
@@ -2126,7 +2126,7 @@
     target: PrefixedIdentifier
       prefix: SimpleIdentifier
         token: c
-        staticElement: c@46
+        staticElement: self::@function::bar::@parameter::c
         staticType: C
       period: .
       identifier: SimpleIdentifier
@@ -2223,7 +2223,7 @@
       leftParenthesis: (
       expression: SimpleIdentifier
         token: a
-        staticElement: a@42
+        staticElement: self::@function::f::@parameter::a
         staticType: A
       rightParenthesis: )
       staticType: A
@@ -2267,12 +2267,12 @@
       expression: BinaryExpression
         leftOperand: SimpleIdentifier
           token: a
-          staticElement: a@45
+          staticElement: self::@function::f::@parameter::a
           staticType: A?
         operator: ??
         rightOperand: SimpleIdentifier
           token: b
-          staticElement: b@50
+          staticElement: self::@function::f::@parameter::b
           staticType: A
         staticElement: <null>
         staticInvokeType: null
@@ -2487,7 +2487,7 @@
   function: PrefixedIdentifier
     prefix: SimpleIdentifier
       token: a
-      staticElement: a@81
+      staticElement: self::@function::bar::@parameter::a
       staticType: A
     period: .
     identifier: SimpleIdentifier
@@ -2757,7 +2757,7 @@
   function: PrefixedIdentifier
     prefix: SimpleIdentifier
       token: a
-      staticElement: a@41
+      staticElement: self::@function::bar::@parameter::a
       staticType: A
     period: .
     identifier: SimpleIdentifier
@@ -2968,7 +2968,7 @@
 FunctionReference
   function: SimpleIdentifier
     token: foo
-    staticElement: foo@31
+    staticElement: self::@function::bar::@parameter::foo
     staticType: void Function<T>(T)
   typeArguments: TypeArgumentList
     leftBracket: <
@@ -3090,7 +3090,7 @@
 FunctionReference
   function: SimpleIdentifier
     token: foo
-    staticElement: foo@31
+    staticElement: self::@function::bar::@parameter::foo
     staticType: T
   typeArguments: TypeArgumentList
     leftBracket: <
@@ -3118,7 +3118,7 @@
 FunctionReference
   function: SimpleIdentifier
     token: foo
-    staticElement: foo@42
+    staticElement: self::@function::bar::@parameter::foo
     staticType: T
   typeArguments: TypeArgumentList
     leftBracket: <
@@ -3151,7 +3151,7 @@
 FunctionReference
   function: SimpleIdentifier
     token: foo
-    staticElement: foo@14
+    staticElement: self::@function::bar::@parameter::foo
     staticType: T
   typeArguments: TypeArgumentList
     leftBracket: <
@@ -3280,7 +3280,7 @@
   function: PrefixedIdentifier
     prefix: SimpleIdentifier
       token: a
-      staticElement: a@12
+      staticElement: self::@function::bar::@parameter::a
       staticType: dynamic
     period: .
     identifier: SimpleIdentifier
@@ -4111,7 +4111,7 @@
   function: PrefixedIdentifier
     prefix: SimpleIdentifier
       token: a
-      staticElement: a@30
+      staticElement: self::@class::B::@method::bar::@parameter::a
       staticType: A
     period: .
     identifier: SimpleIdentifier
@@ -4195,7 +4195,7 @@
 FunctionReference
   function: SimpleIdentifier
     token: foo
-    staticElement: foo@31
+    staticElement: self::@function::bar::@parameter::foo
     staticType: void Function<T>(T)
   typeArguments: TypeArgumentList
     leftBracket: <
diff --git a/pkg/analyzer/test/src/dart/resolution/index_expression_test.dart b/pkg/analyzer/test/src/dart/resolution/index_expression_test.dart
index f4bf3b6..6bb0204 100644
--- a/pkg/analyzer/test/src/dart/resolution/index_expression_test.dart
+++ b/pkg/analyzer/test/src/dart/resolution/index_expression_test.dart
@@ -75,7 +75,7 @@
 IndexExpression
   target: SimpleIdentifier
     token: a
-    staticElement: a@61
+    staticElement: self::@function::f::@parameter::a
     staticType: A
   leftBracket: [
   index: IntegerLiteral
@@ -147,7 +147,7 @@
 IndexExpression
   target: SimpleIdentifier
     token: a
-    staticElement: a@72
+    staticElement: self::@function::f::@parameter::a
     staticType: A<double>
   leftBracket: [
   index: IntegerLiteral
@@ -184,7 +184,7 @@
 IndexExpression
   target: SimpleIdentifier
     token: a
-    staticElement: a@62
+    staticElement: self::@function::f::@parameter::a
     staticType: A?
   leftBracket: [
   index: IntegerLiteral
@@ -223,7 +223,7 @@
   leftHandSide: IndexExpression
     target: SimpleIdentifier
       token: a
-      staticElement: a@100
+      staticElement: self::@function::f::@parameter::a
       staticType: A
     leftBracket: [
     index: IntegerLiteral
@@ -281,7 +281,7 @@
   leftHandSide: IndexExpression
     target: SimpleIdentifier
       token: a
-      staticElement: a@114
+      staticElement: self::@function::f::@parameter::a
       staticType: A<double>
     leftBracket: [
     index: IntegerLiteral
@@ -340,7 +340,7 @@
   leftHandSide: IndexExpression
     target: SimpleIdentifier
       token: a
-      staticElement: a@101
+      staticElement: self::@function::f::@parameter::a
       staticType: A?
     leftBracket: [
     index: IntegerLiteral
@@ -393,7 +393,7 @@
   leftHandSide: IndexExpression
     target: SimpleIdentifier
       token: a
-      staticElement: a@66
+      staticElement: self::@function::f::@parameter::a
       staticType: A
     leftBracket: [
     index: IntegerLiteral
@@ -436,7 +436,7 @@
 CascadeExpression
   target: SimpleIdentifier
     token: a
-    staticElement: a@61
+    staticElement: self::@function::f::@parameter::a
     staticType: A?
   cascadeSections
     AssignmentExpression
@@ -452,7 +452,7 @@
       operator: =
       rightHandSide: SimpleIdentifier
         token: a
-        staticElement: a@61
+        staticElement: self::@function::f::@parameter::a
         staticType: A
       readElement: <null>
       readType: null
@@ -473,7 +473,7 @@
       operator: =
       rightHandSide: SimpleIdentifier
         token: a
-        staticElement: a@61
+        staticElement: self::@function::f::@parameter::a
         staticType: A
       readElement: <null>
       readType: null
@@ -514,7 +514,7 @@
   leftHandSide: IndexExpression
     target: SimpleIdentifier
       token: a
-      staticElement: a@75
+      staticElement: self::@function::f::@parameter::a
       staticType: A<double>
     leftBracket: [
     index: IntegerLiteral
@@ -572,7 +572,7 @@
   leftHandSide: IndexExpression
     target: SimpleIdentifier
       token: a
-      staticElement: a@67
+      staticElement: self::@function::f::@parameter::a
       staticType: A?
     leftBracket: [
     index: IntegerLiteral
diff --git a/pkg/analyzer/test/src/dart/resolution/instance_creation_test.dart b/pkg/analyzer/test/src/dart/resolution/instance_creation_test.dart
index 11c1fb7..b0f2e14 100644
--- a/pkg/analyzer/test/src/dart/resolution/instance_creation_test.dart
+++ b/pkg/analyzer/test/src/dart/resolution/instance_creation_test.dart
@@ -256,7 +256,7 @@
     arguments
       SimpleIdentifier
         token: s
-        staticElement: s@38
+        staticElement: self::@function::f::@parameter::s
         staticType: S & int
     rightParenthesis: )
   staticType: A<S>
diff --git a/pkg/analyzer/test/src/dart/resolution/method_invocation_test.dart b/pkg/analyzer/test/src/dart/resolution/method_invocation_test.dart
index 8e44628..8179271 100644
--- a/pkg/analyzer/test/src/dart/resolution/method_invocation_test.dart
+++ b/pkg/analyzer/test/src/dart/resolution/method_invocation_test.dart
@@ -69,7 +69,7 @@
 MethodInvocation
   target: SimpleIdentifier
     token: foo
-    staticElement: foo@17
+    staticElement: self::@function::f::@parameter::foo
     staticType: Function?
   operator: ?.
   methodName: SimpleIdentifier
@@ -99,7 +99,7 @@
 MethodInvocation
   target: SimpleIdentifier
     token: foo
-    staticElement: foo@17
+    staticElement: self::@function::f::@parameter::foo
     staticType: Function?
   operator: .
   methodName: SimpleIdentifier
@@ -132,7 +132,7 @@
   target: MethodInvocation
     target: SimpleIdentifier
       token: c
-      staticElement: c@75
+      staticElement: self::@function::testShort::@parameter::c
       staticType: C?
     operator: ?.
     methodName: SimpleIdentifier
@@ -174,7 +174,7 @@
   function: PropertyAccess
     target: SimpleIdentifier
       token: c
-      staticElement: c@60
+      staticElement: self::@function::f::@parameter::c
       staticType: C?
     operator: ?.
     propertyName: SimpleIdentifier
@@ -187,7 +187,7 @@
     arguments
       SimpleIdentifier
         token: c
-        staticElement: c@60
+        staticElement: self::@function::f::@parameter::c
         staticType: C
     rightParenthesis: )
   staticElement: <null>
@@ -213,7 +213,7 @@
 MethodInvocation
   target: SimpleIdentifier
     token: e
-    staticElement: e@42
+    staticElement: self::@function::f::@parameter::e
     staticType: E
   operator: .
   methodName: SimpleIdentifier
@@ -248,7 +248,7 @@
 MethodInvocation
   target: SimpleIdentifier
     token: e
-    staticElement: e@70
+    staticElement: self::@function::f::@parameter::e
     staticType: E
   operator: .
   methodName: SimpleIdentifier
@@ -282,7 +282,7 @@
 MethodInvocation
   target: SimpleIdentifier
     token: a
-    staticElement: a@39
+    staticElement: self::@function::f::@parameter::a
     staticType: A?
   operator: .
   methodName: SimpleIdentifier
@@ -320,7 +320,7 @@
 MethodInvocation
   target: SimpleIdentifier
     token: a
-    staticElement: a@77
+    staticElement: self::@function::f::@parameter::a
     staticType: A?
   operator: .
   methodName: SimpleIdentifier
@@ -355,7 +355,7 @@
 MethodInvocation
   target: SimpleIdentifier
     token: a
-    staticElement: a@78
+    staticElement: self::@function::f::@parameter::a
     staticType: A?
   operator: .
   methodName: SimpleIdentifier
@@ -386,7 +386,7 @@
 MethodInvocation
   target: SimpleIdentifier
     token: a
-    staticElement: a@60
+    staticElement: self::@function::f::@parameter::a
     staticType: int?
   operator: .
   methodName: SimpleIdentifier
@@ -420,7 +420,7 @@
 MethodInvocation
   target: SimpleIdentifier
     token: a
-    staticElement: a@22
+    staticElement: self::@function::f::@parameter::a
     staticType: A?
   operator: .
   methodName: SimpleIdentifier
@@ -456,7 +456,7 @@
 MethodInvocation
   target: SimpleIdentifier
     token: a
-    staticElement: a@60
+    staticElement: self::@function::f::@parameter::a
     staticType: A?
   operator: .
   methodName: SimpleIdentifier
@@ -489,7 +489,7 @@
 MethodInvocation
   target: SimpleIdentifier
     token: a
-    staticElement: a@61
+    staticElement: self::@function::f::@parameter::a
     staticType: A?
   operator: .
   methodName: SimpleIdentifier
@@ -592,7 +592,7 @@
 MethodInvocation
   target: SimpleIdentifier
     token: t
-    staticElement: t@13
+    staticElement: self::@function::f::@parameter::t
     staticType: T & int
   operator: .
   methodName: SimpleIdentifier
@@ -627,7 +627,7 @@
 MethodInvocation
   target: SimpleIdentifier
     token: a
-    staticElement: a@102
+    staticElement: self::@function::f::@parameter::a
     staticType: T & U
   operator: .
   methodName: SimpleIdentifier
@@ -768,7 +768,7 @@
 CascadeExpression
   target: SimpleIdentifier
     token: a
-    staticElement: a@59
+    staticElement: self::@function::f::@parameter::a
     staticType: A?
   cascadeSections
     MethodInvocation
@@ -814,7 +814,7 @@
 CascadeExpression
   target: SimpleIdentifier
     token: a
-    staticElement: a@61
+    staticElement: self::@function::f::@parameter::a
     staticType: A?
   cascadeSections
     PropertyAccess
@@ -915,7 +915,7 @@
     arguments
       SimpleIdentifier
         token: o
-        staticElement: o@56
+        staticElement: self::@function::f::@parameter::o
         staticType: dynamic
     rightParenthesis: )
   staticInvokeType: void Function(Object?)
@@ -946,7 +946,7 @@
     arguments
       SimpleIdentifier
         token: o
-        staticElement: o@65
+        staticElement: self::@function::f::@parameter::o
         staticType: List<void>
     rightParenthesis: )
   staticInvokeType: void Function(List<Object?>)
@@ -981,7 +981,7 @@
       MethodInvocation
         target: SimpleIdentifier
           token: a
-          staticElement: a@36
+          staticElement: self::@function::g::@parameter::a
           staticType: double
         operator: .
         methodName: SimpleIdentifier
@@ -1035,7 +1035,7 @@
       MethodInvocation
         target: SimpleIdentifier
           token: a
-          staticElement: a@36
+          staticElement: self::@function::g::@parameter::a
           staticType: double*
         operator: .
         methodName: SimpleIdentifier
@@ -1108,7 +1108,7 @@
       MethodInvocation
         target: SimpleIdentifier
           token: a
-          staticElement: a@36
+          staticElement: self::@function::g::@parameter::a
           staticType: double
         operator: .
         methodName: SimpleIdentifier
@@ -1162,7 +1162,7 @@
       MethodInvocation
         target: SimpleIdentifier
           token: a
-          staticElement: a@36
+          staticElement: self::@function::g::@parameter::a
           staticType: double*
         operator: .
         methodName: SimpleIdentifier
@@ -1222,7 +1222,7 @@
 MethodInvocation
   target: SimpleIdentifier
     token: a
-    staticElement: a@36
+    staticElement: self::@function::g::@parameter::a
     staticType: double
   operator: .
   methodName: SimpleIdentifier
@@ -1265,7 +1265,7 @@
 MethodInvocation
   target: SimpleIdentifier
     token: a
-    staticElement: a@36
+    staticElement: self::@function::g::@parameter::a
     staticType: double*
   operator: .
   methodName: SimpleIdentifier
@@ -1321,7 +1321,7 @@
 MethodInvocation
   target: SimpleIdentifier
     token: a
-    staticElement: a@9
+    staticElement: self::@function::f::@parameter::a
     staticType: double
   operator: .
   methodName: SimpleIdentifier
@@ -1333,11 +1333,11 @@
     arguments
       SimpleIdentifier
         token: b
-        staticElement: b@19
+        staticElement: self::@function::f::@parameter::b
         staticType: double
       SimpleIdentifier
         token: c
-        staticElement: c@29
+        staticElement: self::@function::f::@parameter::c
         staticType: double
     rightParenthesis: )
   staticInvokeType: num Function(num, num)
@@ -1348,7 +1348,7 @@
 MethodInvocation
   target: SimpleIdentifier
     token: a
-    staticElement: a@9
+    staticElement: self::@function::f::@parameter::a
     staticType: double*
   operator: .
   methodName: SimpleIdentifier
@@ -1362,11 +1362,11 @@
     arguments
       SimpleIdentifier
         token: b
-        staticElement: b@19
+        staticElement: self::@function::f::@parameter::b
         staticType: double*
       SimpleIdentifier
         token: c
-        staticElement: c@29
+        staticElement: self::@function::f::@parameter::c
         staticType: double*
     rightParenthesis: )
   staticInvokeType: num* Function(num*, num*)*
@@ -1388,7 +1388,7 @@
 MethodInvocation
   target: SimpleIdentifier
     token: a
-    staticElement: a@9
+    staticElement: self::@function::f::@parameter::a
     staticType: double
   operator: .
   methodName: SimpleIdentifier
@@ -1400,11 +1400,11 @@
     arguments
       SimpleIdentifier
         token: b
-        staticElement: b@19
+        staticElement: self::@function::f::@parameter::b
         staticType: double
       SimpleIdentifier
         token: c
-        staticElement: c@26
+        staticElement: self::@function::f::@parameter::c
         staticType: int
     rightParenthesis: )
   staticInvokeType: num Function(num, num)
@@ -1415,7 +1415,7 @@
 MethodInvocation
   target: SimpleIdentifier
     token: a
-    staticElement: a@9
+    staticElement: self::@function::f::@parameter::a
     staticType: double*
   operator: .
   methodName: SimpleIdentifier
@@ -1429,11 +1429,11 @@
     arguments
       SimpleIdentifier
         token: b
-        staticElement: b@19
+        staticElement: self::@function::f::@parameter::b
         staticType: double*
       SimpleIdentifier
         token: c
-        staticElement: c@26
+        staticElement: self::@function::f::@parameter::c
         staticType: int*
     rightParenthesis: )
   staticInvokeType: num* Function(num*, num*)*
@@ -1455,7 +1455,7 @@
 MethodInvocation
   target: SimpleIdentifier
     token: a
-    staticElement: a@9
+    staticElement: self::@function::f::@parameter::a
     staticType: double
   operator: .
   methodName: SimpleIdentifier
@@ -1467,11 +1467,11 @@
     arguments
       SimpleIdentifier
         token: b
-        staticElement: b@16
+        staticElement: self::@function::f::@parameter::b
         staticType: int
       SimpleIdentifier
         token: c
-        staticElement: c@26
+        staticElement: self::@function::f::@parameter::c
         staticType: double
     rightParenthesis: )
   staticInvokeType: num Function(num, num)
@@ -1482,7 +1482,7 @@
 MethodInvocation
   target: SimpleIdentifier
     token: a
-    staticElement: a@9
+    staticElement: self::@function::f::@parameter::a
     staticType: double*
   operator: .
   methodName: SimpleIdentifier
@@ -1496,11 +1496,11 @@
     arguments
       SimpleIdentifier
         token: b
-        staticElement: b@16
+        staticElement: self::@function::f::@parameter::b
         staticType: int*
       SimpleIdentifier
         token: c
-        staticElement: c@26
+        staticElement: self::@function::f::@parameter::c
         staticType: double*
     rightParenthesis: )
   staticInvokeType: num* Function(num*, num*)*
@@ -1522,7 +1522,7 @@
 MethodInvocation
   target: SimpleIdentifier
     token: a
-    staticElement: a@9
+    staticElement: self::@function::f::@parameter::a
     staticType: double
   operator: .
   methodName: SimpleIdentifier
@@ -1534,11 +1534,11 @@
     arguments
       SimpleIdentifier
         token: b
-        staticElement: b@16
+        staticElement: self::@function::f::@parameter::b
         staticType: int
       SimpleIdentifier
         token: c
-        staticElement: c@23
+        staticElement: self::@function::f::@parameter::c
         staticType: int
     rightParenthesis: )
   staticInvokeType: num Function(num, num)
@@ -1549,7 +1549,7 @@
 MethodInvocation
   target: SimpleIdentifier
     token: a
-    staticElement: a@9
+    staticElement: self::@function::f::@parameter::a
     staticType: double*
   operator: .
   methodName: SimpleIdentifier
@@ -1563,11 +1563,11 @@
     arguments
       SimpleIdentifier
         token: b
-        staticElement: b@16
+        staticElement: self::@function::f::@parameter::b
         staticType: int*
       SimpleIdentifier
         token: c
-        staticElement: c@23
+        staticElement: self::@function::f::@parameter::c
         staticType: int*
     rightParenthesis: )
   staticInvokeType: num* Function(num*, num*)*
@@ -1603,7 +1603,7 @@
       MethodInvocation
         target: SimpleIdentifier
           token: a
-          staticElement: a@33
+          staticElement: self::@function::g::@parameter::a
           staticType: int
         operator: .
         methodName: SimpleIdentifier
@@ -1657,7 +1657,7 @@
       MethodInvocation
         target: SimpleIdentifier
           token: a
-          staticElement: a@33
+          staticElement: self::@function::g::@parameter::a
           staticType: int*
         operator: .
         methodName: SimpleIdentifier
@@ -1726,7 +1726,7 @@
       MethodInvocation
         target: SimpleIdentifier
           token: a
-          staticElement: a@33
+          staticElement: self::@function::g::@parameter::a
           staticType: int
         operator: .
         methodName: SimpleIdentifier
@@ -1780,7 +1780,7 @@
       MethodInvocation
         target: SimpleIdentifier
           token: a
-          staticElement: a@33
+          staticElement: self::@function::g::@parameter::a
           staticType: int*
         operator: .
         methodName: SimpleIdentifier
@@ -1840,7 +1840,7 @@
 MethodInvocation
   target: SimpleIdentifier
     token: a
-    staticElement: a@33
+    staticElement: self::@function::g::@parameter::a
     staticType: int
   operator: .
   methodName: SimpleIdentifier
@@ -1883,7 +1883,7 @@
 MethodInvocation
   target: SimpleIdentifier
     token: a
-    staticElement: a@33
+    staticElement: self::@function::g::@parameter::a
     staticType: int*
   operator: .
   methodName: SimpleIdentifier
@@ -1939,7 +1939,7 @@
 MethodInvocation
   target: SimpleIdentifier
     token: a
-    staticElement: a@6
+    staticElement: self::@function::f::@parameter::a
     staticType: int
   operator: .
   methodName: SimpleIdentifier
@@ -1951,11 +1951,11 @@
     arguments
       SimpleIdentifier
         token: b
-        staticElement: b@16
+        staticElement: self::@function::f::@parameter::b
         staticType: double
       SimpleIdentifier
         token: c
-        staticElement: c@26
+        staticElement: self::@function::f::@parameter::c
         staticType: double
     rightParenthesis: )
   staticInvokeType: num Function(num, num)
@@ -1966,7 +1966,7 @@
 MethodInvocation
   target: SimpleIdentifier
     token: a
-    staticElement: a@6
+    staticElement: self::@function::f::@parameter::a
     staticType: int*
   operator: .
   methodName: SimpleIdentifier
@@ -1980,11 +1980,11 @@
     arguments
       SimpleIdentifier
         token: b
-        staticElement: b@16
+        staticElement: self::@function::f::@parameter::b
         staticType: double*
       SimpleIdentifier
         token: c
-        staticElement: c@26
+        staticElement: self::@function::f::@parameter::c
         staticType: double*
     rightParenthesis: )
   staticInvokeType: num* Function(num*, num*)*
@@ -2006,7 +2006,7 @@
 MethodInvocation
   target: SimpleIdentifier
     token: a
-    staticElement: a@6
+    staticElement: self::@function::f::@parameter::a
     staticType: int
   operator: .
   methodName: SimpleIdentifier
@@ -2018,11 +2018,11 @@
     arguments
       SimpleIdentifier
         token: b
-        staticElement: b@16
+        staticElement: self::@function::f::@parameter::b
         staticType: double
       SimpleIdentifier
         token: c
-        staticElement: c@27
+        staticElement: self::@function::f::@parameter::c
         staticType: dynamic
     rightParenthesis: )
   staticInvokeType: num Function(num, num)
@@ -2033,7 +2033,7 @@
 MethodInvocation
   target: SimpleIdentifier
     token: a
-    staticElement: a@6
+    staticElement: self::@function::f::@parameter::a
     staticType: int*
   operator: .
   methodName: SimpleIdentifier
@@ -2047,11 +2047,11 @@
     arguments
       SimpleIdentifier
         token: b
-        staticElement: b@16
+        staticElement: self::@function::f::@parameter::b
         staticType: double*
       SimpleIdentifier
         token: c
-        staticElement: c@27
+        staticElement: self::@function::f::@parameter::c
         staticType: dynamic
     rightParenthesis: )
   staticInvokeType: num* Function(num*, num*)*
@@ -2073,7 +2073,7 @@
 MethodInvocation
   target: SimpleIdentifier
     token: a
-    staticElement: a@6
+    staticElement: self::@function::f::@parameter::a
     staticType: int
   operator: .
   methodName: SimpleIdentifier
@@ -2085,11 +2085,11 @@
     arguments
       SimpleIdentifier
         token: b
-        staticElement: b@16
+        staticElement: self::@function::f::@parameter::b
         staticType: double
       SimpleIdentifier
         token: c
-        staticElement: c@23
+        staticElement: self::@function::f::@parameter::c
         staticType: int
     rightParenthesis: )
   staticInvokeType: num Function(num, num)
@@ -2100,7 +2100,7 @@
 MethodInvocation
   target: SimpleIdentifier
     token: a
-    staticElement: a@6
+    staticElement: self::@function::f::@parameter::a
     staticType: int*
   operator: .
   methodName: SimpleIdentifier
@@ -2114,11 +2114,11 @@
     arguments
       SimpleIdentifier
         token: b
-        staticElement: b@16
+        staticElement: self::@function::f::@parameter::b
         staticType: double*
       SimpleIdentifier
         token: c
-        staticElement: c@23
+        staticElement: self::@function::f::@parameter::c
         staticType: int*
     rightParenthesis: )
   staticInvokeType: num* Function(num*, num*)*
@@ -2140,7 +2140,7 @@
 MethodInvocation
   target: SimpleIdentifier
     token: a
-    staticElement: a@6
+    staticElement: self::@function::f::@parameter::a
     staticType: int
   operator: .
   methodName: SimpleIdentifier
@@ -2152,11 +2152,11 @@
     arguments
       SimpleIdentifier
         token: b
-        staticElement: b@17
+        staticElement: self::@function::f::@parameter::b
         staticType: dynamic
       SimpleIdentifier
         token: c
-        staticElement: c@27
+        staticElement: self::@function::f::@parameter::c
         staticType: double
     rightParenthesis: )
   staticInvokeType: num Function(num, num)
@@ -2167,7 +2167,7 @@
 MethodInvocation
   target: SimpleIdentifier
     token: a
-    staticElement: a@6
+    staticElement: self::@function::f::@parameter::a
     staticType: int*
   operator: .
   methodName: SimpleIdentifier
@@ -2181,11 +2181,11 @@
     arguments
       SimpleIdentifier
         token: b
-        staticElement: b@17
+        staticElement: self::@function::f::@parameter::b
         staticType: dynamic
       SimpleIdentifier
         token: c
-        staticElement: c@27
+        staticElement: self::@function::f::@parameter::c
         staticType: double*
     rightParenthesis: )
   staticInvokeType: num* Function(num*, num*)*
@@ -2207,7 +2207,7 @@
 MethodInvocation
   target: SimpleIdentifier
     token: a
-    staticElement: a@6
+    staticElement: self::@function::f::@parameter::a
     staticType: int
   operator: .
   methodName: SimpleIdentifier
@@ -2219,11 +2219,11 @@
     arguments
       SimpleIdentifier
         token: b
-        staticElement: b@17
+        staticElement: self::@function::f::@parameter::b
         staticType: dynamic
       SimpleIdentifier
         token: c
-        staticElement: c@24
+        staticElement: self::@function::f::@parameter::c
         staticType: int
     rightParenthesis: )
   staticInvokeType: num Function(num, num)
@@ -2234,7 +2234,7 @@
 MethodInvocation
   target: SimpleIdentifier
     token: a
-    staticElement: a@6
+    staticElement: self::@function::f::@parameter::a
     staticType: int*
   operator: .
   methodName: SimpleIdentifier
@@ -2248,11 +2248,11 @@
     arguments
       SimpleIdentifier
         token: b
-        staticElement: b@17
+        staticElement: self::@function::f::@parameter::b
         staticType: dynamic
       SimpleIdentifier
         token: c
-        staticElement: c@24
+        staticElement: self::@function::f::@parameter::c
         staticType: int*
     rightParenthesis: )
   staticInvokeType: num* Function(num*, num*)*
@@ -2274,7 +2274,7 @@
 MethodInvocation
   target: SimpleIdentifier
     token: a
-    staticElement: a@6
+    staticElement: self::@function::f::@parameter::a
     staticType: int
   operator: .
   methodName: SimpleIdentifier
@@ -2286,11 +2286,11 @@
     arguments
       SimpleIdentifier
         token: b
-        staticElement: b@13
+        staticElement: self::@function::f::@parameter::b
         staticType: int
       SimpleIdentifier
         token: c
-        staticElement: c@23
+        staticElement: self::@function::f::@parameter::c
         staticType: double
     rightParenthesis: )
   staticInvokeType: num Function(num, num)
@@ -2301,7 +2301,7 @@
 MethodInvocation
   target: SimpleIdentifier
     token: a
-    staticElement: a@6
+    staticElement: self::@function::f::@parameter::a
     staticType: int*
   operator: .
   methodName: SimpleIdentifier
@@ -2315,11 +2315,11 @@
     arguments
       SimpleIdentifier
         token: b
-        staticElement: b@13
+        staticElement: self::@function::f::@parameter::b
         staticType: int*
       SimpleIdentifier
         token: c
-        staticElement: c@23
+        staticElement: self::@function::f::@parameter::c
         staticType: double*
     rightParenthesis: )
   staticInvokeType: num* Function(num*, num*)*
@@ -2341,7 +2341,7 @@
 MethodInvocation
   target: SimpleIdentifier
     token: a
-    staticElement: a@6
+    staticElement: self::@function::f::@parameter::a
     staticType: int
   operator: .
   methodName: SimpleIdentifier
@@ -2353,11 +2353,11 @@
     arguments
       SimpleIdentifier
         token: b
-        staticElement: b@13
+        staticElement: self::@function::f::@parameter::b
         staticType: int
       SimpleIdentifier
         token: c
-        staticElement: c@24
+        staticElement: self::@function::f::@parameter::c
         staticType: dynamic
     rightParenthesis: )
   staticInvokeType: num Function(num, num)
@@ -2368,7 +2368,7 @@
 MethodInvocation
   target: SimpleIdentifier
     token: a
-    staticElement: a@6
+    staticElement: self::@function::f::@parameter::a
     staticType: int*
   operator: .
   methodName: SimpleIdentifier
@@ -2382,11 +2382,11 @@
     arguments
       SimpleIdentifier
         token: b
-        staticElement: b@13
+        staticElement: self::@function::f::@parameter::b
         staticType: int*
       SimpleIdentifier
         token: c
-        staticElement: c@24
+        staticElement: self::@function::f::@parameter::c
         staticType: dynamic
     rightParenthesis: )
   staticInvokeType: num* Function(num*, num*)*
@@ -2408,7 +2408,7 @@
 MethodInvocation
   target: SimpleIdentifier
     token: a
-    staticElement: a@6
+    staticElement: self::@function::f::@parameter::a
     staticType: int
   operator: .
   methodName: SimpleIdentifier
@@ -2420,11 +2420,11 @@
     arguments
       SimpleIdentifier
         token: b
-        staticElement: b@13
+        staticElement: self::@function::f::@parameter::b
         staticType: int
       SimpleIdentifier
         token: c
-        staticElement: c@20
+        staticElement: self::@function::f::@parameter::c
         staticType: int
     rightParenthesis: )
   staticInvokeType: num Function(num, num)
@@ -2435,7 +2435,7 @@
 MethodInvocation
   target: SimpleIdentifier
     token: a
-    staticElement: a@6
+    staticElement: self::@function::f::@parameter::a
     staticType: int*
   operator: .
   methodName: SimpleIdentifier
@@ -2449,11 +2449,11 @@
     arguments
       SimpleIdentifier
         token: b
-        staticElement: b@13
+        staticElement: self::@function::f::@parameter::b
         staticType: int*
       SimpleIdentifier
         token: c
-        staticElement: c@20
+        staticElement: self::@function::f::@parameter::c
         staticType: int*
     rightParenthesis: )
   staticInvokeType: num* Function(num*, num*)*
@@ -2487,11 +2487,11 @@
     arguments
       SimpleIdentifier
         token: b
-        staticElement: b@13
+        staticElement: self::@function::f::@parameter::b
         staticType: int
       SimpleIdentifier
         token: c
-        staticElement: c@20
+        staticElement: self::@function::f::@parameter::c
         staticType: int
     rightParenthesis: )
   staticInvokeType: num Function(num, num)
@@ -2512,11 +2512,11 @@
     arguments
       SimpleIdentifier
         token: b
-        staticElement: b@13
+        staticElement: self::@function::f::@parameter::b
         staticType: int*
       SimpleIdentifier
         token: c
-        staticElement: c@20
+        staticElement: self::@function::f::@parameter::c
         staticType: int*
     rightParenthesis: )
   staticInvokeType: num* Function(num*, num*)*
@@ -2549,7 +2549,7 @@
       arguments
         SimpleIdentifier
           token: a
-          staticElement: a@65
+          staticElement: self::@function::f::@parameter::a
           staticType: int
       rightParenthesis: )
     extendedType: int
@@ -2564,11 +2564,11 @@
     arguments
       SimpleIdentifier
         token: b
-        staticElement: b@72
+        staticElement: self::@function::f::@parameter::b
         staticType: int
       SimpleIdentifier
         token: c
-        staticElement: c@79
+        staticElement: self::@function::f::@parameter::c
         staticType: int
     rightParenthesis: )
   staticInvokeType: String Function(int, int)
@@ -2587,7 +2587,7 @@
       arguments
         SimpleIdentifier
           token: a
-          staticElement: a@65
+          staticElement: self::@function::f::@parameter::a
           staticType: int*
       rightParenthesis: )
     extendedType: int*
@@ -2602,11 +2602,11 @@
     arguments
       SimpleIdentifier
         token: b
-        staticElement: b@72
+        staticElement: self::@function::f::@parameter::b
         staticType: int*
       SimpleIdentifier
         token: c
-        staticElement: c@79
+        staticElement: self::@function::f::@parameter::c
         staticType: int*
     rightParenthesis: )
   staticInvokeType: String* Function(int*, int*)*
@@ -2628,7 +2628,7 @@
 MethodInvocation
   target: SimpleIdentifier
     token: a
-    staticElement: a@6
+    staticElement: self::@function::f::@parameter::a
     staticType: int
   operator: .
   methodName: SimpleIdentifier
@@ -2640,11 +2640,11 @@
     arguments
       SimpleIdentifier
         token: b
-        staticElement: b@13
+        staticElement: self::@function::f::@parameter::b
         staticType: int
       SimpleIdentifier
         token: c
-        staticElement: c@22
+        staticElement: self::@function::f::@parameter::c
         staticType: Never
     rightParenthesis: )
   staticInvokeType: num Function(num, num)
@@ -2655,7 +2655,7 @@
 MethodInvocation
   target: SimpleIdentifier
     token: a
-    staticElement: a@6
+    staticElement: self::@function::f::@parameter::a
     staticType: int*
   operator: .
   methodName: SimpleIdentifier
@@ -2669,11 +2669,11 @@
     arguments
       SimpleIdentifier
         token: b
-        staticElement: b@13
+        staticElement: self::@function::f::@parameter::b
         staticType: int*
       SimpleIdentifier
         token: c
-        staticElement: c@22
+        staticElement: self::@function::f::@parameter::c
         staticType: Null*
     rightParenthesis: )
   staticInvokeType: num* Function(num*, num*)*
@@ -2699,7 +2699,7 @@
 MethodInvocation
   target: SimpleIdentifier
     token: a
-    staticElement: a@6
+    staticElement: self::@function::f::@parameter::a
     staticType: int
   operator: .
   methodName: SimpleIdentifier
@@ -2711,11 +2711,11 @@
     arguments
       SimpleIdentifier
         token: b
-        staticElement: b@15
+        staticElement: self::@function::f::@parameter::b
         staticType: Never
       SimpleIdentifier
         token: c
-        staticElement: c@22
+        staticElement: self::@function::f::@parameter::c
         staticType: int
     rightParenthesis: )
   staticInvokeType: num Function(num, num)
@@ -2726,7 +2726,7 @@
 MethodInvocation
   target: SimpleIdentifier
     token: a
-    staticElement: a@6
+    staticElement: self::@function::f::@parameter::a
     staticType: int*
   operator: .
   methodName: SimpleIdentifier
@@ -2740,11 +2740,11 @@
     arguments
       SimpleIdentifier
         token: b
-        staticElement: b@15
+        staticElement: self::@function::f::@parameter::b
         staticType: Null*
       SimpleIdentifier
         token: c
-        staticElement: c@22
+        staticElement: self::@function::f::@parameter::c
         staticType: int*
     rightParenthesis: )
   staticInvokeType: num* Function(num*, num*)*
@@ -2773,7 +2773,7 @@
 MethodInvocation
   target: SimpleIdentifier
     token: a
-    staticElement: a@8
+    staticElement: self::@function::f::@parameter::a
     staticType: Never
   operator: .
   methodName: SimpleIdentifier
@@ -2785,11 +2785,11 @@
     arguments
       SimpleIdentifier
         token: b
-        staticElement: b@15
+        staticElement: self::@function::f::@parameter::b
         staticType: int
       SimpleIdentifier
         token: c
-        staticElement: c@22
+        staticElement: self::@function::f::@parameter::c
         staticType: int
     rightParenthesis: )
   staticInvokeType: dynamic
@@ -2800,7 +2800,7 @@
 MethodInvocation
   target: SimpleIdentifier
     token: a
-    staticElement: a@8
+    staticElement: self::@function::f::@parameter::a
     staticType: Null*
   operator: .
   methodName: SimpleIdentifier
@@ -2812,11 +2812,11 @@
     arguments
       SimpleIdentifier
         token: b
-        staticElement: b@15
+        staticElement: self::@function::f::@parameter::b
         staticType: int*
       SimpleIdentifier
         token: c
-        staticElement: c@22
+        staticElement: self::@function::f::@parameter::c
         staticType: int*
     rightParenthesis: )
   staticInvokeType: dynamic
@@ -2855,7 +2855,7 @@
       MethodInvocation
         target: SimpleIdentifier
           token: a
-          staticElement: a@85
+          staticElement: self::@function::g::@parameter::a
           staticType: A
         operator: .
         methodName: SimpleIdentifier
@@ -2909,7 +2909,7 @@
       MethodInvocation
         target: SimpleIdentifier
           token: a
-          staticElement: a@85
+          staticElement: self::@function::g::@parameter::a
           staticType: A*
         operator: .
         methodName: SimpleIdentifier
@@ -2969,7 +2969,7 @@
 MethodInvocation
   target: SimpleIdentifier
     token: a
-    staticElement: a@55
+    staticElement: self::@function::f::@parameter::a
     staticType: A
   operator: .
   methodName: SimpleIdentifier
@@ -2981,11 +2981,11 @@
     arguments
       SimpleIdentifier
         token: b
-        staticElement: b@62
+        staticElement: self::@function::f::@parameter::b
         staticType: int
       SimpleIdentifier
         token: c
-        staticElement: c@69
+        staticElement: self::@function::f::@parameter::c
         staticType: int
     rightParenthesis: )
   staticInvokeType: String Function(int, int)
@@ -2996,7 +2996,7 @@
 MethodInvocation
   target: SimpleIdentifier
     token: a
-    staticElement: a@55
+    staticElement: self::@function::f::@parameter::a
     staticType: A*
   operator: .
   methodName: SimpleIdentifier
@@ -3008,11 +3008,11 @@
     arguments
       SimpleIdentifier
         token: b
-        staticElement: b@62
+        staticElement: self::@function::f::@parameter::b
         staticType: int*
       SimpleIdentifier
         token: c
-        staticElement: c@69
+        staticElement: self::@function::f::@parameter::c
         staticType: int*
     rightParenthesis: )
   staticInvokeType: String* Function(int*, int*)*
@@ -3046,7 +3046,7 @@
       arguments
         SimpleIdentifier
           token: a
-          staticElement: a@72
+          staticElement: self::@function::f::@parameter::a
           staticType: A
       rightParenthesis: )
     extendedType: A
@@ -3061,11 +3061,11 @@
     arguments
       SimpleIdentifier
         token: b
-        staticElement: b@79
+        staticElement: self::@function::f::@parameter::b
         staticType: int
       SimpleIdentifier
         token: c
-        staticElement: c@86
+        staticElement: self::@function::f::@parameter::c
         staticType: int
     rightParenthesis: )
   staticInvokeType: String Function(int, int)
@@ -3084,7 +3084,7 @@
       arguments
         SimpleIdentifier
           token: a
-          staticElement: a@72
+          staticElement: self::@function::f::@parameter::a
           staticType: A*
       rightParenthesis: )
     extendedType: A*
@@ -3099,11 +3099,11 @@
     arguments
       SimpleIdentifier
         token: b
-        staticElement: b@79
+        staticElement: self::@function::f::@parameter::b
         staticType: int*
       SimpleIdentifier
         token: c
-        staticElement: c@86
+        staticElement: self::@function::f::@parameter::c
         staticType: int*
     rightParenthesis: )
   staticInvokeType: String* Function(int*, int*)*
@@ -3129,7 +3129,7 @@
 MethodInvocation
   target: SimpleIdentifier
     token: a
-    staticElement: a@72
+    staticElement: self::@function::f::@parameter::a
     staticType: A
   operator: .
   methodName: SimpleIdentifier
@@ -3141,11 +3141,11 @@
     arguments
       SimpleIdentifier
         token: b
-        staticElement: b@79
+        staticElement: self::@function::f::@parameter::b
         staticType: int
       SimpleIdentifier
         token: c
-        staticElement: c@86
+        staticElement: self::@function::f::@parameter::c
         staticType: int
     rightParenthesis: )
   staticInvokeType: String Function(int, int)
@@ -3156,7 +3156,7 @@
 MethodInvocation
   target: SimpleIdentifier
     token: a
-    staticElement: a@72
+    staticElement: self::@function::f::@parameter::a
     staticType: A*
   operator: .
   methodName: SimpleIdentifier
@@ -3168,11 +3168,11 @@
     arguments
       SimpleIdentifier
         token: b
-        staticElement: b@79
+        staticElement: self::@function::f::@parameter::b
         staticType: int*
       SimpleIdentifier
         token: c
-        staticElement: c@86
+        staticElement: self::@function::f::@parameter::c
         staticType: int*
     rightParenthesis: )
   staticInvokeType: String* Function(int*, int*)*
@@ -3206,7 +3206,7 @@
     arguments
       SimpleIdentifier
         token: s
-        staticElement: s@34
+        staticElement: self::@function::f::@parameter::s
         staticType: S & int
     rightParenthesis: )
   staticInvokeType: void Function(S)
@@ -3226,7 +3226,7 @@
     arguments
       SimpleIdentifier
         token: s
-        staticElement: s@34
+        staticElement: self::@function::f::@parameter::s
         staticType: S* & int*
     rightParenthesis: )
   staticInvokeType: void Function(S*)*
@@ -3380,7 +3380,7 @@
 MethodInvocation
   target: SimpleIdentifier
     token: a
-    staticElement: a@50
+    staticElement: self::@function::f::@parameter::a
     staticType: A
   operator: .
   methodName: SimpleIdentifier
@@ -3402,7 +3402,7 @@
 MethodInvocation
   target: SimpleIdentifier
     token: a
-    staticElement: a@50
+    staticElement: self::@function::f::@parameter::a
     staticType: A*
   operator: .
   methodName: SimpleIdentifier
@@ -3441,7 +3441,7 @@
 FunctionExpressionInvocation
   function: SimpleIdentifier
     token: c
-    staticElement: c@62
+    staticElement: self::@function::f::@parameter::c
     staticType: C
   argumentList: ArgumentList
     leftParenthesis: (
@@ -3455,7 +3455,7 @@
 FunctionExpressionInvocation
   function: SimpleIdentifier
     token: c
-    staticElement: c@62
+    staticElement: self::@function::f::@parameter::c
     staticType: C*
   argumentList: ArgumentList
     leftParenthesis: (
@@ -3485,7 +3485,7 @@
   function: PropertyAccess
     target: SimpleIdentifier
       token: c
-      staticElement: c@33
+      staticElement: self::@function::f::@parameter::c
       staticType: C
     operator: .
     propertyName: SimpleIdentifier
@@ -3506,7 +3506,7 @@
   function: PropertyAccess
     target: SimpleIdentifier
       token: c
-      staticElement: c@33
+      staticElement: self::@function::f::@parameter::c
       staticType: C*
     operator: .
     propertyName: SimpleIdentifier
@@ -3625,7 +3625,7 @@
 FunctionExpressionInvocation
   function: SimpleIdentifier
     token: foo
-    staticElement: foo@11
+    staticElement: self::@function::f::@parameter::foo
     staticType: Function
   argumentList: ArgumentList
     leftParenthesis: (
@@ -3646,7 +3646,7 @@
 FunctionExpressionInvocation
   function: SimpleIdentifier
     token: foo
-    staticElement: foo@11
+    staticElement: self::@function::f::@parameter::foo
     staticType: Function*
   argumentList: ArgumentList
     leftParenthesis: (
@@ -3738,7 +3738,7 @@
 FunctionExpressionInvocation
   function: SimpleIdentifier
     token: foo
-    staticElement: foo@12
+    staticElement: self::@function::main::@parameter::foo
     staticType: Object
   argumentList: ArgumentList
     leftParenthesis: (
@@ -3752,7 +3752,7 @@
 FunctionExpressionInvocation
   function: SimpleIdentifier
     token: foo
-    staticElement: foo@12
+    staticElement: self::@function::main::@parameter::foo
     staticType: Object*
   argumentList: ArgumentList
     leftParenthesis: (
@@ -3777,7 +3777,7 @@
 FunctionExpressionInvocation
   function: SimpleIdentifier
     token: foo
-    staticElement: foo@9
+    staticElement: self::@function::main::@parameter::foo
     staticType: dynamic
   argumentList: ArgumentList
     leftParenthesis: (
@@ -3791,7 +3791,7 @@
 FunctionExpressionInvocation
   function: SimpleIdentifier
     token: foo
-    staticElement: foo@9
+    staticElement: self::@function::main::@parameter::foo
     staticType: dynamic
   argumentList: ArgumentList
     leftParenthesis: (
@@ -5145,7 +5145,7 @@
   function: PropertyAccess
     target: SimpleIdentifier
       token: c
-      staticElement: c@54
+      staticElement: self::@function::f::@parameter::c
       staticType: C<void>
     operator: .
     propertyName: SimpleIdentifier
@@ -5168,7 +5168,7 @@
   function: PropertyAccess
     target: SimpleIdentifier
       token: c
-      staticElement: c@54
+      staticElement: self::@function::f::@parameter::c
       staticType: C<void>*
     operator: .
     propertyName: SimpleIdentifier
@@ -5857,7 +5857,7 @@
 MethodInvocation
   target: SimpleIdentifier
     token: a
-    staticElement: a@15
+    staticElement: self::@function::f::@parameter::a
     staticType: dynamic
   operator: .
   methodName: SimpleIdentifier
@@ -5882,7 +5882,7 @@
 MethodInvocation
   target: SimpleIdentifier
     token: a
-    staticElement: a@15
+    staticElement: self::@function::f::@parameter::a
     staticType: dynamic
   operator: .
   methodName: SimpleIdentifier
@@ -6305,7 +6305,7 @@
   function: PropertyAccess
     target: SimpleIdentifier
       token: c
-      staticElement: c@71
+      staticElement: self::@function::f::@parameter::c
       staticType: C
     operator: .
     propertyName: SimpleIdentifier
@@ -6330,7 +6330,7 @@
   function: PropertyAccess
     target: SimpleIdentifier
       token: c
-      staticElement: c@71
+      staticElement: self::@function::f::@parameter::c
       staticType: C*
     operator: .
     propertyName: SimpleIdentifier
@@ -6431,7 +6431,7 @@
   function: PropertyAccess
     target: SimpleIdentifier
       token: c
-      staticElement: c@65
+      staticElement: self::@function::f::@parameter::c
       staticType: C
     operator: .
     propertyName: SimpleIdentifier
@@ -6452,7 +6452,7 @@
   function: PropertyAccess
     target: SimpleIdentifier
       token: c
-      staticElement: c@65
+      staticElement: self::@function::f::@parameter::c
       staticType: C*
     operator: .
     propertyName: SimpleIdentifier
@@ -6487,7 +6487,7 @@
 MethodInvocation
   target: SimpleIdentifier
     token: c
-    staticElement: c@43
+    staticElement: self::@function::f::@parameter::c
     staticType: C
   operator: .
   methodName: SimpleIdentifier
@@ -6509,7 +6509,7 @@
 MethodInvocation
   target: SimpleIdentifier
     token: c
-    staticElement: c@43
+    staticElement: self::@function::f::@parameter::c
     staticType: C*
   operator: .
   methodName: SimpleIdentifier
@@ -6548,7 +6548,7 @@
 MethodInvocation
   target: SimpleIdentifier
     token: c
-    staticElement: c@58
+    staticElement: self::@function::f::@parameter::c
     staticType: C
   operator: .
   methodName: SimpleIdentifier
@@ -6572,7 +6572,7 @@
 MethodInvocation
   target: SimpleIdentifier
     token: c
-    staticElement: c@58
+    staticElement: self::@function::f::@parameter::c
     staticType: C*
   operator: .
   methodName: SimpleIdentifier
@@ -6621,7 +6621,7 @@
 MethodInvocation
   target: SimpleIdentifier
     token: c
-    staticElement: c@182
+    staticElement: self::@function::f::@parameter::c
     staticType: C
   operator: .
   methodName: SimpleIdentifier
@@ -6642,7 +6642,7 @@
 MethodInvocation
   target: SimpleIdentifier
     token: c
-    staticElement: c@182
+    staticElement: self::@function::f::@parameter::c
     staticType: C*
   operator: .
   methodName: SimpleIdentifier
@@ -7394,7 +7394,7 @@
 FunctionExpressionInvocation
   function: SimpleIdentifier
     token: c
-    staticElement: c@44
+    staticElement: self::@function::f::@parameter::c
     staticType: C
   argumentList: ArgumentList
     leftParenthesis: (
@@ -7412,7 +7412,7 @@
 FunctionExpressionInvocation
   function: SimpleIdentifier
     token: c
-    staticElement: c@44
+    staticElement: self::@function::f::@parameter::c
     staticType: C*
   argumentList: ArgumentList
     leftParenthesis: (
@@ -7591,7 +7591,7 @@
 FunctionExpressionInvocation
   function: SimpleIdentifier
     token: foo
-    staticElement: foo@26
+    staticElement: self::@function::f::@parameter::foo
     staticType: void Function(int)
   argumentList: ArgumentList
     leftParenthesis: (
@@ -7609,7 +7609,7 @@
 FunctionExpressionInvocation
   function: SimpleIdentifier
     token: foo
-    staticElement: foo@26
+    staticElement: self::@function::f::@parameter::foo
     staticType: void Function(int*)*
   argumentList: ArgumentList
     leftParenthesis: (
@@ -7698,7 +7698,7 @@
 FunctionExpressionInvocation
   function: SimpleIdentifier
     token: a
-    staticElement: a@39
+    staticElement: self::@function::f::@parameter::a
     staticType: void Function()
       alias: self::@typeAlias::F
   argumentList: ArgumentList
@@ -7714,7 +7714,7 @@
 FunctionExpressionInvocation
   function: SimpleIdentifier
     token: a
-    staticElement: a@39
+    staticElement: self::@function::f::@parameter::a
     staticType: void Function()*
       alias: self::@typeAlias::F
   argumentList: ArgumentList
@@ -7886,7 +7886,7 @@
 MethodInvocation
   target: SimpleIdentifier
     token: a
-    staticElement: a@7
+    staticElement: self::@function::f::@parameter::a
     staticType: dynamic
   operator: .
   methodName: SimpleIdentifier
@@ -7898,7 +7898,7 @@
     arguments
       SimpleIdentifier
         token: b
-        staticElement: b@14
+        staticElement: self::@function::f::@parameter::b
         staticType: int
     rightParenthesis: )
   staticInvokeType: dynamic
@@ -7909,7 +7909,7 @@
 MethodInvocation
   target: SimpleIdentifier
     token: a
-    staticElement: a@7
+    staticElement: self::@function::f::@parameter::a
     staticType: dynamic
   operator: .
   methodName: SimpleIdentifier
@@ -7921,7 +7921,7 @@
     arguments
       SimpleIdentifier
         token: b
-        staticElement: b@14
+        staticElement: self::@function::f::@parameter::b
         staticType: int*
     rightParenthesis: )
   staticInvokeType: dynamic
@@ -7943,7 +7943,7 @@
 MethodInvocation
   target: SimpleIdentifier
     token: a
-    staticElement: a@7
+    staticElement: self::@function::f::@parameter::a
     staticType: dynamic
   operator: .
   methodName: SimpleIdentifier
@@ -7961,7 +7961,7 @@
 MethodInvocation
   target: SimpleIdentifier
     token: a
-    staticElement: a@7
+    staticElement: self::@function::f::@parameter::a
     staticType: dynamic
   operator: .
   methodName: SimpleIdentifier
@@ -8262,7 +8262,7 @@
 MethodInvocation
   target: SimpleIdentifier
     token: a
-    staticElement: a@6
+    staticElement: self::@function::f::@parameter::a
     staticType: int
   operator: .
   methodName: SimpleIdentifier
@@ -8274,7 +8274,7 @@
     arguments
       SimpleIdentifier
         token: b
-        staticElement: b@16
+        staticElement: self::@function::f::@parameter::b
         staticType: double
     rightParenthesis: )
   staticInvokeType: num Function(num)
@@ -8285,7 +8285,7 @@
 MethodInvocation
   target: SimpleIdentifier
     token: a
-    staticElement: a@6
+    staticElement: self::@function::f::@parameter::a
     staticType: int*
   operator: .
   methodName: SimpleIdentifier
@@ -8299,7 +8299,7 @@
     arguments
       SimpleIdentifier
         token: b
-        staticElement: b@16
+        staticElement: self::@function::f::@parameter::b
         staticType: double*
     rightParenthesis: )
   staticInvokeType: num* Function(num*)*
@@ -8321,7 +8321,7 @@
 MethodInvocation
   target: SimpleIdentifier
     token: a
-    staticElement: a@6
+    staticElement: self::@function::f::@parameter::a
     staticType: int
   operator: .
   methodName: SimpleIdentifier
@@ -8333,7 +8333,7 @@
     arguments
       SimpleIdentifier
         token: b
-        staticElement: b@13
+        staticElement: self::@function::f::@parameter::b
         staticType: int
     rightParenthesis: )
   staticInvokeType: num Function(num)
@@ -8344,7 +8344,7 @@
 MethodInvocation
   target: SimpleIdentifier
     token: a
-    staticElement: a@6
+    staticElement: self::@function::f::@parameter::a
     staticType: int*
   operator: .
   methodName: SimpleIdentifier
@@ -8358,7 +8358,7 @@
     arguments
       SimpleIdentifier
         token: b
-        staticElement: b@13
+        staticElement: self::@function::f::@parameter::b
         staticType: int*
     rightParenthesis: )
   staticInvokeType: num* Function(num*)*
@@ -8381,7 +8381,7 @@
   target: FunctionExpressionInvocation
     function: SimpleIdentifier
       token: a
-      staticElement: a@17
+      staticElement: self::@function::f::@parameter::a
       staticType: int Function()
     argumentList: ArgumentList
       leftParenthesis: (
@@ -8399,7 +8399,7 @@
     arguments
       SimpleIdentifier
         token: b
-        staticElement: b@24
+        staticElement: self::@function::f::@parameter::b
         staticType: int
     rightParenthesis: )
   staticInvokeType: num Function(num)
@@ -8411,7 +8411,7 @@
   target: FunctionExpressionInvocation
     function: SimpleIdentifier
       token: a
-      staticElement: a@17
+      staticElement: self::@function::f::@parameter::a
       staticType: int* Function()*
     argumentList: ArgumentList
       leftParenthesis: (
@@ -8431,7 +8431,7 @@
     arguments
       SimpleIdentifier
         token: b
-        staticElement: b@24
+        staticElement: self::@function::f::@parameter::b
         staticType: int*
     rightParenthesis: )
   staticInvokeType: num* Function(num*)*
diff --git a/pkg/analyzer/test/src/dart/resolution/postfix_expression_test.dart b/pkg/analyzer/test/src/dart/resolution/postfix_expression_test.dart
index c4ef684..b5bc19b 100644
--- a/pkg/analyzer/test/src/dart/resolution/postfix_expression_test.dart
+++ b/pkg/analyzer/test/src/dart/resolution/postfix_expression_test.dart
@@ -35,7 +35,7 @@
   operand: PropertyAccess
     target: SimpleIdentifier
       token: a
-      staticElement: a@38
+      staticElement: self::@function::f::@parameter::a
       staticType: A?
     operator: ?.
     propertyName: SimpleIdentifier
@@ -71,12 +71,12 @@
 PostfixExpression
   operand: SimpleIdentifier
     token: x
-    staticElement: x@63
+    staticElement: self::@function::f::@parameter::x
     staticType: null
   operator: ++
-  readElement: x@63
+  readElement: self::@function::f::@parameter::x
   readType: A
-  writeElement: x@63
+  writeElement: self::@function::f::@parameter::x
   writeType: Object
   staticElement: self::@class::A::@method::+
   staticType: A
@@ -96,7 +96,7 @@
 PostfixExpression
   operand: SimpleIdentifier
     token: x
-    staticElement: x@12
+    staticElement: self::@function::f::@parameter::x
     staticType: int?
   operator: !
   staticElement: <null>
@@ -124,7 +124,7 @@
 IndexExpression
   target: SimpleIdentifier
     token: a
-    staticElement: a@24
+    staticElement: self::@function::f::@parameter::a
     staticType: Map<String, int>
   leftBracket: [
   index: SimpleStringLiteral
@@ -141,7 +141,7 @@
   operand: IndexExpression
     target: SimpleIdentifier
       token: a
-      staticElement: a@24
+      staticElement: self::@function::f::@parameter::a
       staticType: Map<String, int>
     leftBracket: [
     index: SimpleStringLiteral
@@ -312,7 +312,7 @@
 PostfixExpression
   operand: SimpleIdentifier
     token: x
-    staticElement: x@13
+    staticElement: self::@function::f::@parameter::x
     staticType: T?
   operator: !
   staticElement: <null>
@@ -334,7 +334,7 @@
 PostfixExpression
   operand: SimpleIdentifier
     token: x
-    staticElement: x@13
+    staticElement: self::@function::f::@parameter::x
     staticType: T? & num?
   operator: !
   staticElement: <null>
@@ -357,12 +357,12 @@
 PostfixExpression
   operand: SimpleIdentifier
     token: x
-    staticElement: x@11
+    staticElement: self::@function::f::@parameter::x
     staticType: null
   operator: --
-  readElement: x@11
+  readElement: self::@function::f::@parameter::x
   readType: int
-  writeElement: x@11
+  writeElement: self::@function::f::@parameter::x
   writeType: int
   staticElement: dart:core::@class::num::@method::-
   staticType: int
@@ -372,12 +372,12 @@
 PostfixExpression
   operand: SimpleIdentifier
     token: x
-    staticElement: x@11
+    staticElement: self::@function::f::@parameter::x
     staticType: null
   operator: --
-  readElement: x@11
+  readElement: self::@function::f::@parameter::x
   readType: int*
-  writeElement: x@11
+  writeElement: self::@function::f::@parameter::x
   writeType: int*
   staticElement: MethodMember
     base: dart:core::@class::num::@method::-
@@ -406,7 +406,7 @@
   operand: IndexExpression
     target: SimpleIdentifier
       token: a
-      staticElement: a@91
+      staticElement: self::@function::f::@parameter::a
       staticType: A
     leftBracket: [
     index: IntegerLiteral
@@ -429,7 +429,7 @@
   operand: IndexExpression
     target: SimpleIdentifier
       token: a
-      staticElement: a@91
+      staticElement: self::@function::f::@parameter::a
       staticType: A*
     leftBracket: [
     index: IntegerLiteral
@@ -730,7 +730,7 @@
   operand: PrefixedIdentifier
     prefix: SimpleIdentifier
       token: a
-      staticElement: a@35
+      staticElement: self::@function::f::@parameter::a
       staticType: A
     period: .
     identifier: SimpleIdentifier
@@ -753,7 +753,7 @@
   operand: PrefixedIdentifier
     prefix: SimpleIdentifier
       token: a
-      staticElement: a@35
+      staticElement: self::@function::f::@parameter::a
       staticType: A*
     period: .
     identifier: SimpleIdentifier
@@ -1061,12 +1061,12 @@
 PostfixExpression
   operand: SimpleIdentifier
     token: x
-    staticElement: x@14
+    staticElement: self::@function::f::@parameter::x
     staticType: null
   operator: ++
-  readElement: x@14
+  readElement: self::@function::f::@parameter::x
   readType: double
-  writeElement: x@14
+  writeElement: self::@function::f::@parameter::x
   writeType: double
   staticElement: dart:core::@class::double::@method::+
   staticType: double
@@ -1076,12 +1076,12 @@
 PostfixExpression
   operand: SimpleIdentifier
     token: x
-    staticElement: x@14
+    staticElement: self::@function::f::@parameter::x
     staticType: null
   operator: ++
-  readElement: x@14
+  readElement: self::@function::f::@parameter::x
   readType: double*
-  writeElement: x@14
+  writeElement: self::@function::f::@parameter::x
   writeType: double*
   staticElement: MethodMember
     base: dart:core::@class::double::@method::+
@@ -1104,12 +1104,12 @@
 PostfixExpression
   operand: SimpleIdentifier
     token: x
-    staticElement: x@11
+    staticElement: self::@function::f::@parameter::x
     staticType: null
   operator: ++
-  readElement: x@11
+  readElement: self::@function::f::@parameter::x
   readType: int
-  writeElement: x@11
+  writeElement: self::@function::f::@parameter::x
   writeType: int
   staticElement: dart:core::@class::num::@method::+
   staticType: int
@@ -1119,12 +1119,12 @@
 PostfixExpression
   operand: SimpleIdentifier
     token: x
-    staticElement: x@11
+    staticElement: self::@function::f::@parameter::x
     staticType: null
   operator: ++
-  readElement: x@11
+  readElement: self::@function::f::@parameter::x
   readType: int*
-  writeElement: x@11
+  writeElement: self::@function::f::@parameter::x
   writeType: int*
   staticElement: MethodMember
     base: dart:core::@class::num::@method::+
@@ -1147,12 +1147,12 @@
 PostfixExpression
   operand: SimpleIdentifier
     token: x
-    staticElement: x@11
+    staticElement: self::@function::f::@parameter::x
     staticType: null
   operator: ++
-  readElement: x@11
+  readElement: self::@function::f::@parameter::x
   readType: num
-  writeElement: x@11
+  writeElement: self::@function::f::@parameter::x
   writeType: num
   staticElement: dart:core::@class::num::@method::+
   staticType: num
@@ -1162,12 +1162,12 @@
 PostfixExpression
   operand: SimpleIdentifier
     token: x
-    staticElement: x@11
+    staticElement: self::@function::f::@parameter::x
     staticType: null
   operator: ++
-  readElement: x@11
+  readElement: self::@function::f::@parameter::x
   readType: num*
-  writeElement: x@11
+  writeElement: self::@function::f::@parameter::x
   writeType: num*
   staticElement: MethodMember
     base: dart:core::@class::num::@method::+
diff --git a/pkg/analyzer/test/src/dart/resolution/prefix_expression_test.dart b/pkg/analyzer/test/src/dart/resolution/prefix_expression_test.dart
index c04f8a3..d196a4a 100644
--- a/pkg/analyzer/test/src/dart/resolution/prefix_expression_test.dart
+++ b/pkg/analyzer/test/src/dart/resolution/prefix_expression_test.dart
@@ -38,7 +38,7 @@
   operand: PropertyAccess
     target: SimpleIdentifier
       token: a
-      staticElement: a@47
+      staticElement: self::@function::f::@parameter::a
       staticType: A?
     operator: ?.
     propertyName: SimpleIdentifier
@@ -71,7 +71,7 @@
   operand: PropertyAccess
     target: SimpleIdentifier
       token: a
-      staticElement: a@43
+      staticElement: self::@function::f::@parameter::a
       staticType: A?
     operator: ?.
     propertyName: SimpleIdentifier
@@ -102,11 +102,11 @@
   operator: ++
   operand: SimpleIdentifier
     token: x
-    staticElement: x@63
+    staticElement: self::@function::f::@parameter::x
     staticType: null
-  readElement: x@63
+  readElement: self::@function::f::@parameter::x
   readType: A
-  writeElement: x@63
+  writeElement: self::@function::f::@parameter::x
   writeType: Object
   staticElement: self::@class::A::@method::+
   staticType: Object
@@ -130,7 +130,7 @@
   operand: PropertyAccess
     target: SimpleIdentifier
       token: a
-      staticElement: a@38
+      staticElement: self::@function::f::@parameter::a
       staticType: A?
     operator: ?.
     propertyName: SimpleIdentifier
@@ -167,7 +167,7 @@
   operand: PropertyAccess
     target: SimpleIdentifier
       token: a
-      staticElement: a@43
+      staticElement: self::@function::f::@parameter::a
       staticType: A?
     operator: ?.
     propertyName: SimpleIdentifier
@@ -241,7 +241,7 @@
   operator: !
   operand: SimpleIdentifier
     token: x
-    staticElement: x@12
+    staticElement: self::@function::f::@parameter::x
     staticType: bool
   staticElement: <null>
   staticType: bool
@@ -252,7 +252,7 @@
   operator: !
   operand: SimpleIdentifier
     token: x
-    staticElement: x@12
+    staticElement: self::@function::f::@parameter::x
     staticType: bool*
   staticElement: <null>
   staticType: bool*
@@ -276,7 +276,7 @@
   operator: !
   operand: SimpleIdentifier
     token: x
-    staticElement: x@11
+    staticElement: self::@function::f::@parameter::x
     staticType: int
   staticElement: <null>
   staticType: bool
@@ -287,7 +287,7 @@
   operator: !
   operand: SimpleIdentifier
     token: x
-    staticElement: x@11
+    staticElement: self::@function::f::@parameter::x
     staticType: int*
   staticElement: <null>
   staticType: bool*
@@ -315,7 +315,7 @@
   operand: IndexExpression
     target: SimpleIdentifier
       token: a
-      staticElement: a@91
+      staticElement: self::@function::f::@parameter::a
       staticType: A
     leftBracket: [
     index: IntegerLiteral
@@ -338,7 +338,7 @@
   operand: IndexExpression
     target: SimpleIdentifier
       token: a
-      staticElement: a@91
+      staticElement: self::@function::f::@parameter::a
       staticType: A*
     leftBracket: [
     index: IntegerLiteral
@@ -499,7 +499,7 @@
   operator: -
   operand: SimpleIdentifier
     token: x
-    staticElement: x@11
+    staticElement: self::@function::f::@parameter::x
     staticType: int
   staticElement: dart:core::@class::int::@method::unary-
   staticType: int
@@ -510,7 +510,7 @@
   operator: -
   operand: SimpleIdentifier
     token: x
-    staticElement: x@11
+    staticElement: self::@function::f::@parameter::x
     staticType: int*
   staticElement: MethodMember
     base: dart:core::@class::int::@method::unary-
@@ -552,7 +552,7 @@
       arguments
         SimpleIdentifier
           token: c
-          staticElement: c@89
+          staticElement: self::@function::f::@parameter::c
           staticType: C
       rightParenthesis: )
     extendedType: C
@@ -578,7 +578,7 @@
       arguments
         SimpleIdentifier
           token: c
-          staticElement: c@89
+          staticElement: self::@function::f::@parameter::c
           staticType: C*
       rightParenthesis: )
     extendedType: C*
@@ -655,7 +655,7 @@
   operand: PrefixedIdentifier
     prefix: SimpleIdentifier
       token: a
-      staticElement: a@35
+      staticElement: self::@function::f::@parameter::a
       staticType: A
     period: .
     identifier: SimpleIdentifier
@@ -678,7 +678,7 @@
   operand: PrefixedIdentifier
     prefix: SimpleIdentifier
       token: a
-      staticElement: a@35
+      staticElement: self::@function::f::@parameter::a
       staticType: A*
     period: .
     identifier: SimpleIdentifier
@@ -981,11 +981,11 @@
   operator: ++
   operand: SimpleIdentifier
     token: x
-    staticElement: x@14
+    staticElement: self::@function::f::@parameter::x
     staticType: null
-  readElement: x@14
+  readElement: self::@function::f::@parameter::x
   readType: double
-  writeElement: x@14
+  writeElement: self::@function::f::@parameter::x
   writeType: double
   staticElement: dart:core::@class::double::@method::+
   staticType: double
@@ -996,11 +996,11 @@
   operator: ++
   operand: SimpleIdentifier
     token: x
-    staticElement: x@14
+    staticElement: self::@function::f::@parameter::x
     staticType: null
-  readElement: x@14
+  readElement: self::@function::f::@parameter::x
   readType: double*
-  writeElement: x@14
+  writeElement: self::@function::f::@parameter::x
   writeType: double*
   staticElement: MethodMember
     base: dart:core::@class::double::@method::+
@@ -1024,11 +1024,11 @@
   operator: ++
   operand: SimpleIdentifier
     token: x
-    staticElement: x@11
+    staticElement: self::@function::f::@parameter::x
     staticType: null
-  readElement: x@11
+  readElement: self::@function::f::@parameter::x
   readType: int
-  writeElement: x@11
+  writeElement: self::@function::f::@parameter::x
   writeType: int
   staticElement: dart:core::@class::num::@method::+
   staticType: int
@@ -1039,11 +1039,11 @@
   operator: ++
   operand: SimpleIdentifier
     token: x
-    staticElement: x@11
+    staticElement: self::@function::f::@parameter::x
     staticType: null
-  readElement: x@11
+  readElement: self::@function::f::@parameter::x
   readType: int*
-  writeElement: x@11
+  writeElement: self::@function::f::@parameter::x
   writeType: int*
   staticElement: MethodMember
     base: dart:core::@class::num::@method::+
@@ -1067,11 +1067,11 @@
   operator: ++
   operand: SimpleIdentifier
     token: x
-    staticElement: x@11
+    staticElement: self::@function::f::@parameter::x
     staticType: null
-  readElement: x@11
+  readElement: self::@function::f::@parameter::x
   readType: num
-  writeElement: x@11
+  writeElement: self::@function::f::@parameter::x
   writeType: num
   staticElement: dart:core::@class::num::@method::+
   staticType: num
@@ -1082,11 +1082,11 @@
   operator: ++
   operand: SimpleIdentifier
     token: x
-    staticElement: x@11
+    staticElement: self::@function::f::@parameter::x
     staticType: null
-  readElement: x@11
+  readElement: self::@function::f::@parameter::x
   readType: num*
-  writeElement: x@11
+  writeElement: self::@function::f::@parameter::x
   writeType: num*
   staticElement: MethodMember
     base: dart:core::@class::num::@method::+
@@ -1115,11 +1115,11 @@
   operator: ++
   operand: SimpleIdentifier
     token: x
-    staticElement: x@24
+    staticElement: self::@function::f::@parameter::x
     staticType: null
-  readElement: x@24
+  readElement: self::@function::f::@parameter::x
   readType: T
-  writeElement: x@24
+  writeElement: self::@function::f::@parameter::x
   writeType: T
   staticElement: dart:core::@class::num::@method::+
   staticType: num
@@ -1130,11 +1130,11 @@
   operator: ++
   operand: SimpleIdentifier
     token: x
-    staticElement: x@24
+    staticElement: self::@function::f::@parameter::x
     staticType: null
-  readElement: x@24
+  readElement: self::@function::f::@parameter::x
   readType: T*
-  writeElement: x@24
+  writeElement: self::@function::f::@parameter::x
   writeType: T*
   staticElement: MethodMember
     base: dart:core::@class::num::@method::+
@@ -1398,7 +1398,7 @@
   operator: ~
   operand: SimpleIdentifier
     token: x
-    staticElement: x@11
+    staticElement: self::@function::f::@parameter::x
     staticType: int
   staticElement: dart:core::@class::int::@method::~
   staticType: int
@@ -1409,7 +1409,7 @@
   operator: ~
   operand: SimpleIdentifier
     token: x
-    staticElement: x@11
+    staticElement: self::@function::f::@parameter::x
     staticType: int*
   staticElement: MethodMember
     base: dart:core::@class::int::@method::~
diff --git a/pkg/analyzer/test/src/dart/resolution/prefixed_identifier_test.dart b/pkg/analyzer/test/src/dart/resolution/prefixed_identifier_test.dart
index 1b7beb4f..1fd8874 100644
--- a/pkg/analyzer/test/src/dart/resolution/prefixed_identifier_test.dart
+++ b/pkg/analyzer/test/src/dart/resolution/prefixed_identifier_test.dart
@@ -95,7 +95,7 @@
   leftHandSide: PrefixedIdentifier
     prefix: SimpleIdentifier
       token: e
-      staticElement: e@46
+      staticElement: self::@function::f::@parameter::e
       staticType: E
     period: .
     identifier: SimpleIdentifier
@@ -351,7 +351,7 @@
   leftHandSide: PrefixedIdentifier
     prefix: SimpleIdentifier
       token: a
-      staticElement: a@37
+      staticElement: self::@function::f::@parameter::a
       staticType: A
     period: .
     identifier: SimpleIdentifier
@@ -377,7 +377,7 @@
   leftHandSide: PrefixedIdentifier
     prefix: SimpleIdentifier
       token: a
-      staticElement: a@37
+      staticElement: self::@function::f::@parameter::a
       staticType: A*
     period: .
     identifier: SimpleIdentifier
@@ -420,7 +420,7 @@
   leftHandSide: PrefixedIdentifier
     prefix: SimpleIdentifier
       token: a
-      staticElement: a@37
+      staticElement: self::@function::f::@parameter::a
       staticType: A
     period: .
     identifier: SimpleIdentifier
@@ -446,7 +446,7 @@
   leftHandSide: PrefixedIdentifier
     prefix: SimpleIdentifier
       token: a
-      staticElement: a@37
+      staticElement: self::@function::f::@parameter::a
       staticType: A*
     period: .
     identifier: SimpleIdentifier
diff --git a/pkg/analyzer/test/src/dart/resolution/property_access_test.dart b/pkg/analyzer/test/src/dart/resolution/property_access_test.dart
index 6460408..ed2065a 100644
--- a/pkg/analyzer/test/src/dart/resolution/property_access_test.dart
+++ b/pkg/analyzer/test/src/dart/resolution/property_access_test.dart
@@ -246,7 +246,7 @@
       leftParenthesis: (
       expression: SimpleIdentifier
         token: e
-        staticElement: e@46
+        staticElement: self::@function::f::@parameter::e
         staticType: E
       rightParenthesis: )
       staticType: E
@@ -327,7 +327,7 @@
         arguments
           SimpleIdentifier
             token: a
-            staticElement: a@83
+            staticElement: self::@function::f::@parameter::a
             staticType: A
         rightParenthesis: )
       extendedType: A
@@ -363,7 +363,7 @@
         arguments
           SimpleIdentifier
             token: a
-            staticElement: a@83
+            staticElement: self::@function::f::@parameter::a
             staticType: A*
         rightParenthesis: )
       extendedType: A*
@@ -418,7 +418,7 @@
         arguments
           SimpleIdentifier
             token: a
-            staticElement: a@63
+            staticElement: self::@function::f::@parameter::a
             staticType: A
         rightParenthesis: )
       extendedType: A
@@ -454,7 +454,7 @@
         arguments
           SimpleIdentifier
             token: a
-            staticElement: a@63
+            staticElement: self::@function::f::@parameter::a
             staticType: A*
         rightParenthesis: )
       extendedType: A*
diff --git a/pkg/analyzer/test/src/dart/resolution/type_inference/extension_methods_test.dart b/pkg/analyzer/test/src/dart/resolution/type_inference/extension_methods_test.dart
index a0f0291..579a3d4 100644
--- a/pkg/analyzer/test/src/dart/resolution/type_inference/extension_methods_test.dart
+++ b/pkg/analyzer/test/src/dart/resolution/type_inference/extension_methods_test.dart
@@ -83,7 +83,7 @@
 MethodInvocation
   target: SimpleIdentifier
     token: other
-    staticElement: other@75
+    staticElement: self::@extension::E::@method::bar::@parameter::other
     staticType: List<T>
   operator: .
   methodName: SimpleIdentifier
@@ -103,7 +103,7 @@
 MethodInvocation
   target: SimpleIdentifier
     token: other
-    staticElement: other@75
+    staticElement: self::@extension::E::@method::bar::@parameter::other
     staticType: List<T*>*
   operator: .
   methodName: SimpleIdentifier
@@ -187,7 +187,7 @@
   leftHandSide: PrefixedIdentifier
     prefix: SimpleIdentifier
       token: a
-      staticElement: a@79
+      staticElement: self::@function::f::@parameter::a
       staticType: A<int>
     period: .
     identifier: SimpleIdentifier
@@ -215,7 +215,7 @@
   leftHandSide: PrefixedIdentifier
     prefix: SimpleIdentifier
       token: a
-      staticElement: a@79
+      staticElement: self::@function::f::@parameter::a
       staticType: A<int*>*
     period: .
     identifier: SimpleIdentifier
@@ -257,7 +257,7 @@
 MethodInvocation
   target: SimpleIdentifier
     token: x
-    staticElement: x@87
+    staticElement: self::@function::f::@parameter::x
     staticType: S
   operator: .
   methodName: SimpleIdentifier
@@ -277,7 +277,7 @@
 MethodInvocation
   target: SimpleIdentifier
     token: x
-    staticElement: x@87
+    staticElement: self::@function::f::@parameter::x
     staticType: S*
   operator: .
   methodName: SimpleIdentifier
@@ -349,7 +349,7 @@
       leftParenthesis: (
       expression: SimpleIdentifier
         token: x
-        staticElement: x@98
+        staticElement: self::@function::f::@parameter::x
         staticType: S
       rightParenthesis: )
       staticType: S
@@ -389,7 +389,7 @@
       leftParenthesis: (
       expression: SimpleIdentifier
         token: x
-        staticElement: x@98
+        staticElement: self::@function::f::@parameter::x
         staticType: S*
       rightParenthesis: )
       staticType: S*
@@ -586,7 +586,7 @@
         arguments
           SimpleIdentifier
             token: a
-            staticElement: a@79
+            staticElement: self::@function::f::@parameter::a
             staticType: A<int>
         rightParenthesis: )
       extendedType: A<num>
@@ -636,7 +636,7 @@
         arguments
           SimpleIdentifier
             token: a
-            staticElement: a@79
+            staticElement: self::@function::f::@parameter::a
             staticType: A<int*>*
         rightParenthesis: )
       extendedType: A<num*>*
@@ -793,7 +793,7 @@
         arguments
           SimpleIdentifier
             token: a
-            staticElement: a@79
+            staticElement: self::@function::f::@parameter::a
             staticType: A<int>
         rightParenthesis: )
       extendedType: A<int>
@@ -833,7 +833,7 @@
         arguments
           SimpleIdentifier
             token: a
-            staticElement: a@79
+            staticElement: self::@function::f::@parameter::a
             staticType: A<int*>*
         rightParenthesis: )
       extendedType: A<int*>*
diff --git a/pkg/analyzer/test/src/diagnostics/abstract_super_member_reference_test.dart b/pkg/analyzer/test/src/diagnostics/abstract_super_member_reference_test.dart
index 12d705e..d743a92 100644
--- a/pkg/analyzer/test/src/diagnostics/abstract_super_member_reference_test.dart
+++ b/pkg/analyzer/test/src/diagnostics/abstract_super_member_reference_test.dart
@@ -536,7 +536,7 @@
   operator: =
   rightHandSide: SimpleIdentifier
     token: a
-    staticElement: a@99
+    staticElement: self::@class::B::@setter::foo::@parameter::a
     staticType: int
   readElement: <null>
   readType: null
@@ -577,7 +577,7 @@
   operator: =
   rightHandSide: SimpleIdentifier
     token: a
-    staticElement: a@90
+    staticElement: self::@class::B::@setter::foo::@parameter::a
     staticType: int
   readElement: <null>
   readType: null
diff --git a/pkg/analyzer/test/src/diagnostics/instance_access_to_static_member_test.dart b/pkg/analyzer/test/src/diagnostics/instance_access_to_static_member_test.dart
index c9f63b1..d06b020 100644
--- a/pkg/analyzer/test/src/diagnostics/instance_access_to_static_member_test.dart
+++ b/pkg/analyzer/test/src/diagnostics/instance_access_to_static_member_test.dart
@@ -165,7 +165,7 @@
   leftHandSide: PrefixedIdentifier
     prefix: SimpleIdentifier
       token: c
-      staticElement: c@63
+      staticElement: self::@function::f::@parameter::c
       staticType: C
     period: .
     identifier: SimpleIdentifier
diff --git a/pkg/analyzer/test/src/diagnostics/invalid_assignment_test.dart b/pkg/analyzer/test/src/diagnostics/invalid_assignment_test.dart
index babc082..b61e607 100644
--- a/pkg/analyzer/test/src/diagnostics/invalid_assignment_test.dart
+++ b/pkg/analyzer/test/src/diagnostics/invalid_assignment_test.dart
@@ -387,7 +387,7 @@
 FunctionReference
   function: SimpleIdentifier
     token: f
-    staticElement: f@49
+    staticElement: self::@function::foo::@parameter::f
     staticType: int Function<T extends int>()
   staticType: int Function()
   typeArgumentTypes
diff --git a/pkg/analyzer/test/src/diagnostics/non_null_opt_out_test.dart b/pkg/analyzer/test/src/diagnostics/non_null_opt_out_test.dart
index d8c9850..ab85796 100644
--- a/pkg/analyzer/test/src/diagnostics/non_null_opt_out_test.dart
+++ b/pkg/analyzer/test/src/diagnostics/non_null_opt_out_test.dart
@@ -44,7 +44,7 @@
   leftHandSide: IndexExpression
     target: SimpleIdentifier
       token: a
-      staticElement: a@40
+      staticElement: self::@function::main::@parameter::a
       staticType: A*
     leftBracket: [
     index: NullLiteral
@@ -89,7 +89,7 @@
   leftHandSide: PrefixedIdentifier
     prefix: SimpleIdentifier
       token: a
-      staticElement: a@40
+      staticElement: self::@function::main::@parameter::a
       staticType: A*
     period: .
     identifier: SimpleIdentifier
@@ -135,7 +135,7 @@
   leftHandSide: PrefixedIdentifier
     prefix: SimpleIdentifier
       token: a
-      staticElement: a@40
+      staticElement: self::@function::main::@parameter::a
       staticType: A*
     period: .
     identifier: SimpleIdentifier
@@ -433,7 +433,7 @@
         arguments
           SimpleIdentifier
             token: a
-            staticElement: a@40
+            staticElement: self::@function::main::@parameter::a
             staticType: A*
         rightParenthesis: )
       extendedType: A
diff --git a/pkg/analyzer/test/src/diagnostics/receiver_of_type_never_test.dart b/pkg/analyzer/test/src/diagnostics/receiver_of_type_never_test.dart
index d78fa8a..8e202b1 100644
--- a/pkg/analyzer/test/src/diagnostics/receiver_of_type_never_test.dart
+++ b/pkg/analyzer/test/src/diagnostics/receiver_of_type_never_test.dart
@@ -30,7 +30,7 @@
 BinaryExpression
   leftOperand: SimpleIdentifier
     token: x
-    staticElement: x@13
+    staticElement: self::@function::f::@parameter::x
     staticType: Never
   operator: ==
   rightOperand: BinaryExpression
@@ -64,7 +64,7 @@
 BinaryExpression
   leftOperand: SimpleIdentifier
     token: x
-    staticElement: x@13
+    staticElement: self::@function::f::@parameter::x
     staticType: Never
   operator: +
   rightOperand: ParenthesizedExpression
@@ -99,7 +99,7 @@
 BinaryExpression
   leftOperand: SimpleIdentifier
     token: x
-    staticElement: x@14
+    staticElement: self::@function::f::@parameter::x
     staticType: Never?
   operator: ==
   rightOperand: BinaryExpression
@@ -135,7 +135,7 @@
 BinaryExpression
   leftOperand: SimpleIdentifier
     token: x
-    staticElement: x@14
+    staticElement: self::@function::f::@parameter::x
     staticType: Never?
   operator: +
   rightOperand: ParenthesizedExpression
@@ -210,7 +210,7 @@
 IndexExpression
   target: SimpleIdentifier
     token: x
-    staticElement: x@13
+    staticElement: self::@function::f::@parameter::x
     staticType: Never
   leftBracket: [
   index: IntegerLiteral
@@ -238,7 +238,7 @@
   leftHandSide: IndexExpression
     target: SimpleIdentifier
       token: x
-      staticElement: x@13
+      staticElement: self::@function::f::@parameter::x
       staticType: Never
     leftBracket: [
     index: IntegerLiteral
@@ -283,7 +283,7 @@
   leftHandSide: IndexExpression
     target: SimpleIdentifier
       token: x
-      staticElement: x@13
+      staticElement: self::@function::f::@parameter::x
       staticType: Never
     leftBracket: [
     index: IntegerLiteral
@@ -327,7 +327,7 @@
 IndexExpression
   target: SimpleIdentifier
     token: x
-    staticElement: x@14
+    staticElement: self::@function::f::@parameter::x
     staticType: Never?
   leftBracket: [
   index: IntegerLiteral
@@ -355,7 +355,7 @@
   leftHandSide: IndexExpression
     target: SimpleIdentifier
       token: x
-      staticElement: x@14
+      staticElement: self::@function::f::@parameter::x
       staticType: Never?
     leftBracket: [
     index: IntegerLiteral
@@ -400,7 +400,7 @@
   leftHandSide: IndexExpression
     target: SimpleIdentifier
       token: x
-      staticElement: x@14
+      staticElement: self::@function::f::@parameter::x
       staticType: Never?
     leftBracket: [
     index: IntegerLiteral
@@ -453,7 +453,7 @@
 MethodInvocation
   target: SimpleIdentifier
     token: x
-    staticElement: x@13
+    staticElement: self::@function::f::@parameter::x
     staticType: Never
   operator: .
   methodName: SimpleIdentifier
@@ -495,7 +495,7 @@
 MethodInvocation
   target: SimpleIdentifier
     token: x
-    staticElement: x@13
+    staticElement: self::@function::f::@parameter::x
     staticType: Never
   operator: .
   methodName: SimpleIdentifier
@@ -536,7 +536,7 @@
 MethodInvocation
   target: SimpleIdentifier
     token: x
-    staticElement: x@14
+    staticElement: self::@function::f::@parameter::x
     staticType: Never?
   operator: .
   methodName: SimpleIdentifier
@@ -576,12 +576,12 @@
 PostfixExpression
   operand: SimpleIdentifier
     token: x
-    staticElement: x@13
+    staticElement: self::@function::f::@parameter::x
     staticType: null
   operator: ++
-  readElement: x@13
+  readElement: self::@function::f::@parameter::x
   readType: Never
-  writeElement: x@13
+  writeElement: self::@function::f::@parameter::x
   writeType: Never
   staticElement: <null>
   staticType: Never
@@ -602,12 +602,12 @@
 PostfixExpression
   operand: SimpleIdentifier
     token: x
-    staticElement: x@14
+    staticElement: self::@function::f::@parameter::x
     staticType: null
   operator: ++
-  readElement: x@14
+  readElement: self::@function::f::@parameter::x
   readType: Never?
-  writeElement: x@14
+  writeElement: self::@function::f::@parameter::x
   writeType: Never?
   staticElement: <null>
   staticType: Never?
@@ -629,11 +629,11 @@
   operator: ++
   operand: SimpleIdentifier
     token: x
-    staticElement: x@13
+    staticElement: self::@function::f::@parameter::x
     staticType: null
-  readElement: x@13
+  readElement: self::@function::f::@parameter::x
   readType: Never
-  writeElement: x@13
+  writeElement: self::@function::f::@parameter::x
   writeType: Never
   staticElement: <null>
   staticType: Never
@@ -655,11 +655,11 @@
   operator: ++
   operand: SimpleIdentifier
     token: x
-    staticElement: x@14
+    staticElement: self::@function::f::@parameter::x
     staticType: null
-  readElement: x@14
+  readElement: self::@function::f::@parameter::x
   readType: Never?
-  writeElement: x@14
+  writeElement: self::@function::f::@parameter::x
   writeType: Never?
   staticElement: <null>
   staticType: dynamic
@@ -709,7 +709,7 @@
   leftHandSide: PrefixedIdentifier
     prefix: SimpleIdentifier
       token: x
-      staticElement: x@13
+      staticElement: self::@function::f::@parameter::x
       staticType: Never
     period: .
     identifier: SimpleIdentifier
@@ -760,7 +760,7 @@
   leftHandSide: PrefixedIdentifier
     prefix: SimpleIdentifier
       token: x
-      staticElement: x@13
+      staticElement: self::@function::f::@parameter::x
       staticType: Never
     period: .
     identifier: SimpleIdentifier
diff --git a/pkg/analyzer/test/src/diagnostics/use_of_nullable_value_test.dart b/pkg/analyzer/test/src/diagnostics/use_of_nullable_value_test.dart
index eab579e..14711e9 100644
--- a/pkg/analyzer/test/src/diagnostics/use_of_nullable_value_test.dart
+++ b/pkg/analyzer/test/src/diagnostics/use_of_nullable_value_test.dart
@@ -418,7 +418,7 @@
     target: PrefixedIdentifier
       prefix: SimpleIdentifier
         token: b
-        staticElement: b@79
+        staticElement: self::@function::m::@parameter::b
         staticType: B
       period: .
       identifier: SimpleIdentifier
@@ -455,7 +455,7 @@
     target: PrefixedIdentifier
       prefix: SimpleIdentifier
         token: b
-        staticElement: b@79
+        staticElement: self::@function::m::@parameter::b
         staticType: B
       period: .
       identifier: SimpleIdentifier
@@ -499,7 +499,7 @@
 AssignmentExpression
   leftHandSide: SimpleIdentifier
     token: x
-    staticElement: x@6
+    staticElement: self::@function::m::@parameter::x
     staticType: null
   operator: =
   rightHandSide: IntegerLiteral
@@ -507,7 +507,7 @@
     staticType: int
   readElement: <null>
   readType: null
-  writeElement: x@6
+  writeElement: self::@function::m::@parameter::x
   writeType: int
   staticElement: <null>
   staticType: int
@@ -521,7 +521,7 @@
 AssignmentExpression
   leftHandSide: SimpleIdentifier
     token: y
-    staticElement: y@14
+    staticElement: self::@function::m::@parameter::y
     staticType: null
   operator: =
   rightHandSide: IntegerLiteral
@@ -529,7 +529,7 @@
     staticType: int
   readElement: <null>
   readType: null
-  writeElement: y@14
+  writeElement: self::@function::m::@parameter::y
   writeType: int?
   staticElement: <null>
   staticType: int
@@ -568,7 +568,7 @@
     target: PrefixedIdentifier
       prefix: SimpleIdentifier
         token: b
-        staticElement: b@88
+        staticElement: self::@function::m::@parameter::b
         staticType: B
       period: .
       identifier: SimpleIdentifier
@@ -605,7 +605,7 @@
     target: PrefixedIdentifier
       prefix: SimpleIdentifier
         token: b
-        staticElement: b@88
+        staticElement: self::@function::m::@parameter::b
         staticType: B
       period: .
       identifier: SimpleIdentifier
@@ -664,7 +664,7 @@
     target: PrefixedIdentifier
       prefix: SimpleIdentifier
         token: b
-        staticElement: b@79
+        staticElement: self::@function::m::@parameter::b
         staticType: B
       period: .
       identifier: SimpleIdentifier
@@ -697,7 +697,7 @@
     target: PrefixedIdentifier
       prefix: SimpleIdentifier
         token: b
-        staticElement: b@79
+        staticElement: self::@function::m::@parameter::b
         staticType: B
       period: .
       identifier: SimpleIdentifier
@@ -741,15 +741,15 @@
 AssignmentExpression
   leftHandSide: SimpleIdentifier
     token: x
-    staticElement: x@6
+    staticElement: self::@function::m::@parameter::x
     staticType: null
   operator: +=
   rightHandSide: IntegerLiteral
     literal: 0
     staticType: int
-  readElement: x@6
+  readElement: self::@function::m::@parameter::x
   readType: int
-  writeElement: x@6
+  writeElement: self::@function::m::@parameter::x
   writeType: int
   staticElement: dart:core::@class::num::@method::+
   staticType: int
@@ -763,15 +763,15 @@
 AssignmentExpression
   leftHandSide: SimpleIdentifier
     token: y
-    staticElement: y@14
+    staticElement: self::@function::m::@parameter::y
     staticType: null
   operator: +=
   rightHandSide: IntegerLiteral
     literal: 0
     staticType: int
-  readElement: y@14
+  readElement: self::@function::m::@parameter::y
   readType: int?
-  writeElement: y@14
+  writeElement: self::@function::m::@parameter::y
   writeType: int?
   staticElement: dart:core::@class::num::@method::+
   staticType: int
diff --git a/pkg/analyzer/test/src/summary/elements_test.dart b/pkg/analyzer/test/src/summary/elements_test.dart
index 1ad15af..1c9ff23 100644
--- a/pkg/analyzer/test/src/summary/elements_test.dart
+++ b/pkg/analyzer/test/src/summary/elements_test.dart
@@ -729,7 +729,7 @@
                 condition: BinaryExpression
                   leftOperand: SimpleIdentifier
                     token: x @36
-                    staticElement: x@24
+                    staticElement: self::@class::C::@constructor::•::@parameter::x
                     staticType: int
                   operator: >= @38
                   rightOperand: IntegerLiteral
@@ -765,7 +765,7 @@
                 condition: BinaryExpression
                   leftOperand: SimpleIdentifier
                     token: x @36
-                    staticElement: x@24
+                    staticElement: self::@class::C::@constructor::•::@parameter::x
                     staticType: int
                   operator: >= @38
                   rightOperand: IntegerLiteral
@@ -934,7 +934,7 @@
                   operator: + @46
                   rightOperand: SimpleIdentifier
                     token: p @48
-                    staticElement: p@35
+                    staticElement: self::@class::C::@constructor::•::@parameter::p
                     staticType: int
                   staticElement: dart:core::@class::num::@method::+
                   staticInvokeType: num Function(num)
@@ -1441,7 +1441,7 @@
                 parameters
                   requiredPositional d @82
                     type: T
-                superConstructorParameter: a@22
+                superConstructorParameter: self::@class::A::@constructor::•::@parameter::a
             superConstructor: self::@class::A::@constructor::•
 ''');
   }
@@ -1473,7 +1473,7 @@
             parameters
               requiredPositional final super.a @59
                 type: int
-                superConstructorParameter: a@18
+                superConstructorParameter: self::@class::A::@constructor::•::@parameter::a
             superConstructor: self::@class::A::@constructor::•
 ''');
   }
@@ -1505,7 +1505,7 @@
             parameters
               requiredPositional final super.a @61
                 type: int?
-                superConstructorParameter: a@19
+                superConstructorParameter: self::@class::A::@constructor::•::@parameter::a
             superConstructor: self::@class::A::@constructor::•
 ''');
   }
@@ -1663,12 +1663,12 @@
                 type: String
               optionalPositional final super.a @77
                 type: int
-                superConstructorParameter: a@18
+                superConstructorParameter: self::@class::A::@constructor::•::@parameter::a
               optionalPositional o2 @87
                 type: String
               optionalPositional final super.b @97
                 type: double
-                superConstructorParameter: b@28
+                superConstructorParameter: self::@class::A::@constructor::•::@parameter::b
             superConstructor: self::@class::A::@constructor::•
 ''');
   }
@@ -1750,12 +1750,12 @@
                 type: String
               requiredPositional final super.a @76
                 type: int
-                superConstructorParameter: a@18
+                superConstructorParameter: self::@class::A::@constructor::•::@parameter::a
               requiredPositional o2 @86
                 type: String
               requiredPositional final super.b @96
                 type: double
-                superConstructorParameter: b@28
+                superConstructorParameter: self::@class::A::@constructor::•::@parameter::b
             superConstructor: self::@class::A::@constructor::•
 ''');
   }
@@ -1793,7 +1793,7 @@
             parameters
               requiredPositional final super.a @64
                 type: int
-                superConstructorParameter: a@101
+                superConstructorParameter: self::@class::B::@constructor::•::@parameter::a
             superConstructor: self::@class::B::@constructor::•
       class B @77
         supertype: A
@@ -1802,7 +1802,7 @@
             parameters
               requiredPositional final super.a @101
                 type: int
-                superConstructorParameter: a@27
+                superConstructorParameter: self::@class::A::@constructor::•::@parameter::a
             superConstructor: self::@class::A::@constructor::•
 ''');
   }
@@ -1841,7 +1841,7 @@
               requiredPositional final super.a @63
                 type: int
                 superConstructorParameter: SuperFormalParameterMember
-                  base: a@103
+                  base: self::@class::B::@constructor::•::@parameter::a
                   substitution: {T: String}
             superConstructor: ConstructorMember
               base: self::@class::B::@constructor::•
@@ -1856,7 +1856,7 @@
             parameters
               requiredPositional final super.a @103
                 type: int
-                superConstructorParameter: a@18
+                superConstructorParameter: self::@class::A::@constructor::•::@parameter::a
             superConstructor: self::@class::A::@constructor::•
 ''');
   }
@@ -7529,7 +7529,7 @@
                   arguments
                     SimpleIdentifier
                       token: x @-1
-                      staticElement: x@-1
+                      staticElement: self::@class::MixinApp::@constructor::requiredArg::@parameter::x
                       staticType: dynamic
                   rightParenthesis: ) @0
                 staticElement: package:test/a.dart::@class::Base::@constructor::requiredArg
@@ -7555,7 +7555,7 @@
                   arguments
                     SimpleIdentifier
                       token: x @-1
-                      staticElement: x@-1
+                      staticElement: self::@class::MixinApp::@constructor::positionalArg::@parameter::x
                       staticType: bool
                   rightParenthesis: ) @0
                 staticElement: package:test/a.dart::@class::Base::@constructor::positionalArg
@@ -7581,7 +7581,7 @@
                   arguments
                     SimpleIdentifier
                       token: x @-1
-                      staticElement: x@-1
+                      staticElement: self::@class::MixinApp::@constructor::positionalArg2::@parameter::x
                       staticType: bool
                   rightParenthesis: ) @0
                 staticElement: package:test/a.dart::@class::Base::@constructor::positionalArg2
@@ -7607,7 +7607,7 @@
                   arguments
                     SimpleIdentifier
                       token: x @-1
-                      staticElement: x@-1
+                      staticElement: self::@class::MixinApp::@constructor::namedArg::@parameter::x
                       staticType: int
                   rightParenthesis: ) @0
                 staticElement: package:test/a.dart::@class::Base::@constructor::namedArg
@@ -7633,7 +7633,7 @@
                   arguments
                     SimpleIdentifier
                       token: x @-1
-                      staticElement: x@-1
+                      staticElement: self::@class::MixinApp::@constructor::namedArg2::@parameter::x
                       staticType: bool
                   rightParenthesis: ) @0
                 staticElement: package:test/a.dart::@class::Base::@constructor::namedArg2
@@ -7693,11 +7693,11 @@
                   arguments
                     SimpleIdentifier
                       token: t @-1
-                      staticElement: t@-1
+                      staticElement: self::@class::MixinApp::@constructor::ctor::@parameter::t
                       staticType: dynamic
                     SimpleIdentifier
                       token: l @-1
-                      staticElement: l@-1
+                      staticElement: self::@class::MixinApp::@constructor::ctor::@parameter::l
                       staticType: List<dynamic>
                   rightParenthesis: ) @0
                 staticElement: self::@class::Base::@constructor::ctor
@@ -7762,11 +7762,11 @@
                   arguments
                     SimpleIdentifier
                       token: t @-1
-                      staticElement: t@-1
+                      staticElement: self::@class::MixinApp::@constructor::ctor::@parameter::t
                       staticType: List<U>
                     SimpleIdentifier
                       token: l @-1
-                      staticElement: l@-1
+                      staticElement: self::@class::MixinApp::@constructor::ctor::@parameter::l
                       staticType: List<List<U>>
                   rightParenthesis: ) @0
                 staticElement: self::@class::Base::@constructor::ctor
@@ -18364,7 +18364,7 @@
                 condition: IsExpression
                   expression: SimpleIdentifier
                     token: a @57
-                    staticElement: a@45
+                    staticElement: self::@enum::E::@constructor::•::@parameter::a
                     staticType: T?
                   isOperator: is @59
                   type: NamedType
@@ -22239,7 +22239,7 @@
                     ImplicitCallReference
                       expression: SimpleIdentifier
                         token: c @68
-                        staticElement: c@52
+                        staticElement: self::@class::D::@constructor::•::@parameter::c
                         staticType: C
                       staticElement: self::@class::C::@method::call
                       staticType: void Function()
@@ -29765,7 +29765,7 @@
                       staticElement: self::@getter::a
                       staticType: null
                     element: self::@getter::a
-                superConstructorParameter: x@35
+                superConstructorParameter: self::@class::A::@constructor::•::@parameter::x
             superConstructor: self::@class::A::@constructor::•
     topLevelVariables
       static const a @6
@@ -31559,7 +31559,7 @@
             parameters
               requiredPositional value @24
                 type: int
-                nonSynthetic: value@24
+                nonSynthetic: self::@class::C::@setter::foo::@parameter::value
             returnType: void
             nonSynthetic: self::@class::C::@setter::foo
 ''',
@@ -31698,7 +31698,7 @@
             parameters
               requiredPositional value @35
                 type: int
-                nonSynthetic: value@35
+                nonSynthetic: self::@extension::E::@setter::foo::@parameter::value
             returnType: void
             nonSynthetic: self::@extension::E::@setter::foo
 ''',
@@ -31790,7 +31790,7 @@
             parameters
               requiredPositional value @24
                 type: int
-                nonSynthetic: value@24
+                nonSynthetic: self::@mixin::M::@setter::foo::@parameter::value
             returnType: void
             nonSynthetic: self::@mixin::M::@setter::foo
 ''',
@@ -31840,7 +31840,7 @@
         parameters
           requiredPositional value @30
             type: int
-            nonSynthetic: value@30
+            nonSynthetic: self::@setter::foo::@parameter::value
         returnType: void
         nonSynthetic: self::@setter::foo
 ''',
@@ -31865,7 +31865,7 @@
         parameters
           requiredPositional value @12
             type: int
-            nonSynthetic: value@12
+            nonSynthetic: self::@setter::foo::@parameter::value
         returnType: void
         nonSynthetic: self::@setter::foo
 ''',
@@ -33037,7 +33037,7 @@
                   arguments
                     SimpleIdentifier
                       token: value @-1
-                      staticElement: value@-1
+                      staticElement: self::@class::B::@constructor::•::@parameter::value
                       staticType: T
                   rightParenthesis: ) @0
                 staticElement: self::@class::A::@constructor::•
diff --git a/pkg/analyzer/test/src/summary/resolved_ast_printer.dart b/pkg/analyzer/test/src/summary/resolved_ast_printer.dart
index 3cc7fdd..0b4c9bc 100644
--- a/pkg/analyzer/test/src/summary/resolved_ast_printer.dart
+++ b/pkg/analyzer/test/src/summary/resolved_ast_printer.dart
@@ -1233,6 +1233,24 @@
     }
   }
 
+  String _elementToReferenceString(Element element) {
+    final enclosingElement = element.enclosingElement;
+    final reference = (element as ElementImpl).reference;
+    if (reference != null) {
+      return _referenceToString(reference);
+    } else if (element is ParameterElement &&
+        enclosingElement is! GenericFunctionTypeElement) {
+      // Positional parameters don't have actual references.
+      // But we fabricate one to make the output better.
+      final enclosingStr = enclosingElement != null
+          ? _elementToReferenceString(enclosingElement)
+          : 'root';
+      return '$enclosingStr::@parameter::${element.name}';
+    } else {
+      return '${element.name}@${element.nameOffset}';
+    }
+  }
+
   String _referenceToString(Reference reference) {
     var parent = reference.parent!;
     if (parent.parent == null) {
@@ -1309,13 +1327,8 @@
     } else if (element is MultiplyDefinedElement) {
       _sink.writeln('<null>');
     } else {
-      var reference = (element as ElementImpl).reference;
-      if (reference != null) {
-        var referenceStr = _referenceToString(reference);
-        _sink.writeln(referenceStr);
-      } else {
-        _sink.writeln('${element.name}@${element.nameOffset}');
-      }
+      final referenceStr = _elementToReferenceString(element);
+      _sink.writeln(referenceStr);
     }
   }