Version 3.1.0-205.0.dev

Merge 6bdb88b into dev
dart-lang · Jun 13, 2023 · 41234fa · 41234fa
2 parents 4dce109 + 6bdb88b
commit 41234fa
Show file tree

Hide file tree

Showing 711 changed files with 6,932 additions and 8,002 deletions.
diff --git a/.github/workflows/scorecards-analysis.yml b/.github/workflows/scorecards-analysis.yml
@@ -23,7 +23,7 @@ jobs:
 
     steps:
       - name: "Checkout code"
-        uses: actions/checkout@8e5e7e5ab8b370d6c329ec480221332ada57f0ab
+        uses: actions/checkout@c85c95e3d7251135ab7dc9ce3241c5835cc595a9
         with:
           persist-credentials: false
 
@@ -51,6 +51,6 @@ jobs:
 
       # Upload the results to GitHub's code scanning dashboard.
       - name: "Upload to code-scanning"
-        uses: github/codeql-action/upload-sarif@83f0fe6c4988d98a455712a27f0255212bba9bd4
+        uses: github/codeql-action/upload-sarif@cdcdbb579706841c47f7063dda365e292e5cad7a
         with:
           sarif_file: results.sarif
diff --git a/build/config/sysroot.gni b/build/config/sysroot.gni
@@ -29,6 +29,9 @@ if (is_linux) {
     } else if (current_cpu == "arm64") {
       target_sysroot = rebase_path("//build/linux/alpine-linux-aarch64-sysroot",
                                    root_build_dir)
+    } else if (current_cpu == "riscv64") {
+      target_sysroot = rebase_path("//build/linux/alpine-linux-riscv64-sysroot",
+                                   root_build_dir)
     } else {
       print("There is no $dart_sysroot sysroot present for $current_cpu")
       assert(false)

diff --git a/pkg/_fe_analyzer_shared/lib/src/messages/codes_generated.dart b/pkg/_fe_analyzer_shared/lib/src/messages/codes_generated.dart
@@ -10044,6 +10044,150 @@ const MessageCode messageNonPartOfDirectiveInPart = const MessageCode(
     correctionMessage:
         r"""Try removing the other directives, or moving them to the library for which this is a part.""");
 
+// DO NOT EDIT. THIS FILE IS GENERATED. SEE TOP OF FILE.
+const Template<
+    Message Function(
+        String
+            name)> templateNonPatchClassConflict = const Template<
+        Message Function(String name)>(
+    problemMessageTemplate:
+        r"""Class '#name' conflicts with an existing class of the same name in the origin library.""",
+    correctionMessageTemplate:
+        r"""Try changing the name of the class or adding an '@patch' annotation.""",
+    withArguments: _withArgumentsNonPatchClassConflict);
+
+// DO NOT EDIT. THIS FILE IS GENERATED. SEE TOP OF FILE.
+const Code<Message Function(String name)> codeNonPatchClassConflict =
+    const Code<Message Function(String name)>(
+  "NonPatchClassConflict",
+);
+
+// DO NOT EDIT. THIS FILE IS GENERATED. SEE TOP OF FILE.
+Message _withArgumentsNonPatchClassConflict(String name) {
+  if (name.isEmpty) throw 'No name provided';
+  name = demangleMixinApplicationName(name);
+  return new Message(codeNonPatchClassConflict,
+      problemMessage:
+          """Class '${name}' conflicts with an existing class of the same name in the origin library.""",
+      correctionMessage: """Try changing the name of the class or adding an '@patch' annotation.""",
+      arguments: {'name': name});
+}
+
+// DO NOT EDIT. THIS FILE IS GENERATED. SEE TOP OF FILE.
+const Template<
+    Message Function(
+        String
+            name)> templateNonPatchClassMemberConflict = const Template<
+        Message Function(String name)>(
+    problemMessageTemplate:
+        r"""Member '#name' conflicts with an existing member of the same name in the origin class.""",
+    correctionMessageTemplate:
+        r"""Try changing the name of the member or adding an '@patch' annotation.""",
+    withArguments: _withArgumentsNonPatchClassMemberConflict);
+
+// DO NOT EDIT. THIS FILE IS GENERATED. SEE TOP OF FILE.
+const Code<Message Function(String name)> codeNonPatchClassMemberConflict =
+    const Code<Message Function(String name)>(
+  "NonPatchClassMemberConflict",
+);
+
+// DO NOT EDIT. THIS FILE IS GENERATED. SEE TOP OF FILE.
+Message _withArgumentsNonPatchClassMemberConflict(String name) {
+  if (name.isEmpty) throw 'No name provided';
+  name = demangleMixinApplicationName(name);
+  return new Message(codeNonPatchClassMemberConflict,
+      problemMessage:
+          """Member '${name}' conflicts with an existing member of the same name in the origin class.""",
+      correctionMessage: """Try changing the name of the member or adding an '@patch' annotation.""",
+      arguments: {'name': name});
+}
+
+// DO NOT EDIT. THIS FILE IS GENERATED. SEE TOP OF FILE.
+const Template<
+    Message Function(
+        String
+            name)> templateNonPatchConstructorConflict = const Template<
+        Message Function(String name)>(
+    problemMessageTemplate:
+        r"""Constructor '#name' conflicts with an existing constructor of the same name in the origin class.""",
+    correctionMessageTemplate:
+        r"""Try changing the name of the constructor or adding an '@patch' annotation.""",
+    withArguments: _withArgumentsNonPatchConstructorConflict);
+
+// DO NOT EDIT. THIS FILE IS GENERATED. SEE TOP OF FILE.
+const Code<Message Function(String name)> codeNonPatchConstructorConflict =
+    const Code<Message Function(String name)>(
+  "NonPatchConstructorConflict",
+);
+
+// DO NOT EDIT. THIS FILE IS GENERATED. SEE TOP OF FILE.
+Message _withArgumentsNonPatchConstructorConflict(String name) {
+  if (name.isEmpty) throw 'No name provided';
+  name = demangleMixinApplicationName(name);
+  return new Message(codeNonPatchConstructorConflict,
+      problemMessage:
+          """Constructor '${name}' conflicts with an existing constructor of the same name in the origin class.""",
+      correctionMessage: """Try changing the name of the constructor or adding an '@patch' annotation.""",
+      arguments: {'name': name});
+}
+
+// DO NOT EDIT. THIS FILE IS GENERATED. SEE TOP OF FILE.
+const Template<
+    Message Function(
+        String
+            name)> templateNonPatchLibraryConflict = const Template<
+        Message Function(String name)>(
+    problemMessageTemplate:
+        r"""Declaration '#name' conflicts with an existing declaration of the same name in the origin library.""",
+    correctionMessageTemplate: r"""Try changing the name of the declaration.""",
+    withArguments: _withArgumentsNonPatchLibraryConflict);
+
+// DO NOT EDIT. THIS FILE IS GENERATED. SEE TOP OF FILE.
+const Code<Message Function(String name)> codeNonPatchLibraryConflict =
+    const Code<Message Function(String name)>(
+  "NonPatchLibraryConflict",
+);
+
+// DO NOT EDIT. THIS FILE IS GENERATED. SEE TOP OF FILE.
+Message _withArgumentsNonPatchLibraryConflict(String name) {
+  if (name.isEmpty) throw 'No name provided';
+  name = demangleMixinApplicationName(name);
+  return new Message(codeNonPatchLibraryConflict,
+      problemMessage:
+          """Declaration '${name}' conflicts with an existing declaration of the same name in the origin library.""",
+      correctionMessage: """Try changing the name of the declaration.""",
+      arguments: {'name': name});
+}
+
+// DO NOT EDIT. THIS FILE IS GENERATED. SEE TOP OF FILE.
+const Template<
+    Message Function(
+        String
+            name)> templateNonPatchLibraryMemberConflict = const Template<
+        Message Function(String name)>(
+    problemMessageTemplate:
+        r"""Member '#name' conflicts with an existing member of the same name in the origin library.""",
+    correctionMessageTemplate:
+        r"""Try changing the name of the member or adding an '@patch' annotation.""",
+    withArguments: _withArgumentsNonPatchLibraryMemberConflict);
+
+// DO NOT EDIT. THIS FILE IS GENERATED. SEE TOP OF FILE.
+const Code<Message Function(String name)> codeNonPatchLibraryMemberConflict =
+    const Code<Message Function(String name)>(
+  "NonPatchLibraryMemberConflict",
+);
+
+// DO NOT EDIT. THIS FILE IS GENERATED. SEE TOP OF FILE.
+Message _withArgumentsNonPatchLibraryMemberConflict(String name) {
+  if (name.isEmpty) throw 'No name provided';
+  name = demangleMixinApplicationName(name);
+  return new Message(codeNonPatchLibraryMemberConflict,
+      problemMessage:
+          """Member '${name}' conflicts with an existing member of the same name in the origin library.""",
+      correctionMessage: """Try changing the name of the member or adding an '@patch' annotation.""",
+      arguments: {'name': name});
+}
+
 // DO NOT EDIT. THIS FILE IS GENERATED. SEE TOP OF FILE.
 const Code<Null> codeNonPositiveArrayDimensions =
     messageNonPositiveArrayDimensions;
@@ -13033,6 +13177,149 @@ Message _withArgumentsUnmatchedAugmentationLibraryMember(String name) {
       arguments: {'name': name});
 }
 
+// DO NOT EDIT. THIS FILE IS GENERATED. SEE TOP OF FILE.
+const Template<
+    Message Function(String name)> templateUnmatchedPatchClass = const Template<
+        Message Function(String name)>(
+    problemMessageTemplate:
+        r"""Patch class '#name' doesn't match a class in the origin library.""",
+    correctionMessageTemplate:
+        r"""Try changing the name to an existing class or removing the '@patch' annotation.""",
+    withArguments: _withArgumentsUnmatchedPatchClass);
+
+// DO NOT EDIT. THIS FILE IS GENERATED. SEE TOP OF FILE.
+const Code<Message Function(String name)> codeUnmatchedPatchClass =
+    const Code<Message Function(String name)>(
+  "UnmatchedPatchClass",
+);
+
+// DO NOT EDIT. THIS FILE IS GENERATED. SEE TOP OF FILE.
+Message _withArgumentsUnmatchedPatchClass(String name) {
+  if (name.isEmpty) throw 'No name provided';
+  name = demangleMixinApplicationName(name);
+  return new Message(codeUnmatchedPatchClass,
+      problemMessage:
+          """Patch class '${name}' doesn't match a class in the origin library.""",
+      correctionMessage: """Try changing the name to an existing class or removing the '@patch' annotation.""",
+      arguments: {'name': name});
+}
+
+// DO NOT EDIT. THIS FILE IS GENERATED. SEE TOP OF FILE.
+const Template<
+    Message Function(
+        String
+            name)> templateUnmatchedPatchClassMember = const Template<
+        Message Function(String name)>(
+    problemMessageTemplate:
+        r"""Patch member '#name' doesn't match a member in the origin class.""",
+    correctionMessageTemplate:
+        r"""Try changing the name to an existing member or removing the '@patch' annotation.""",
+    withArguments: _withArgumentsUnmatchedPatchClassMember);
+
+// DO NOT EDIT. THIS FILE IS GENERATED. SEE TOP OF FILE.
+const Code<Message Function(String name)> codeUnmatchedPatchClassMember =
+    const Code<Message Function(String name)>(
+  "UnmatchedPatchClassMember",
+);
+
+// DO NOT EDIT. THIS FILE IS GENERATED. SEE TOP OF FILE.
+Message _withArgumentsUnmatchedPatchClassMember(String name) {
+  if (name.isEmpty) throw 'No name provided';
+  name = demangleMixinApplicationName(name);
+  return new Message(codeUnmatchedPatchClassMember,
+      problemMessage:
+          """Patch member '${name}' doesn't match a member in the origin class.""",
+      correctionMessage: """Try changing the name to an existing member or removing the '@patch' annotation.""",
+      arguments: {'name': name});
+}
+
+// DO NOT EDIT. THIS FILE IS GENERATED. SEE TOP OF FILE.
+const Template<
+    Message Function(
+        String
+            name)> templateUnmatchedPatchConstructor = const Template<
+        Message Function(String name)>(
+    problemMessageTemplate:
+        r"""Patch constructor '#name' doesn't match a constructor in the origin class.""",
+    correctionMessageTemplate:
+        r"""Try changing the name to an existing constructor or removing the '@patch' annotation.""",
+    withArguments: _withArgumentsUnmatchedPatchConstructor);
+
+// DO NOT EDIT. THIS FILE IS GENERATED. SEE TOP OF FILE.
+const Code<Message Function(String name)> codeUnmatchedPatchConstructor =
+    const Code<Message Function(String name)>(
+  "UnmatchedPatchConstructor",
+);
+
+// DO NOT EDIT. THIS FILE IS GENERATED. SEE TOP OF FILE.
+Message _withArgumentsUnmatchedPatchConstructor(String name) {
+  if (name.isEmpty) throw 'No name provided';
+  name = demangleMixinApplicationName(name);
+  return new Message(codeUnmatchedPatchConstructor,
+      problemMessage:
+          """Patch constructor '${name}' doesn't match a constructor in the origin class.""",
+      correctionMessage: """Try changing the name to an existing constructor or removing the '@patch' annotation.""",
+      arguments: {'name': name});
+}
+
+// DO NOT EDIT. THIS FILE IS GENERATED. SEE TOP OF FILE.
+const Template<
+    Message Function(
+        String
+            name)> templateUnmatchedPatchDeclaration = const Template<
+        Message Function(String name)>(
+    problemMessageTemplate:
+        r"""Patch '#name' doesn't match a declaration in the origin library.""",
+    correctionMessageTemplate:
+        r"""Try changing the name to an existing declaration or removing the '@patch' annotation.""",
+    withArguments: _withArgumentsUnmatchedPatchDeclaration);
+
+// DO NOT EDIT. THIS FILE IS GENERATED. SEE TOP OF FILE.
+const Code<Message Function(String name)> codeUnmatchedPatchDeclaration =
+    const Code<Message Function(String name)>(
+  "UnmatchedPatchDeclaration",
+);
+
+// DO NOT EDIT. THIS FILE IS GENERATED. SEE TOP OF FILE.
+Message _withArgumentsUnmatchedPatchDeclaration(String name) {
+  if (name.isEmpty) throw 'No name provided';
+  name = demangleMixinApplicationName(name);
+  return new Message(codeUnmatchedPatchDeclaration,
+      problemMessage:
+          """Patch '${name}' doesn't match a declaration in the origin library.""",
+      correctionMessage: """Try changing the name to an existing declaration or removing the '@patch' annotation.""",
+      arguments: {'name': name});
+}
+
+// DO NOT EDIT. THIS FILE IS GENERATED. SEE TOP OF FILE.
+const Template<
+    Message Function(
+        String
+            name)> templateUnmatchedPatchLibraryMember = const Template<
+        Message Function(String name)>(
+    problemMessageTemplate:
+        r"""Patch member '#name' doesn't match a member in the origin library.""",
+    correctionMessageTemplate:
+        r"""Try changing the name to an existing member or removing the '@patch' annotation.""",
+    withArguments: _withArgumentsUnmatchedPatchLibraryMember);
+
+// DO NOT EDIT. THIS FILE IS GENERATED. SEE TOP OF FILE.
+const Code<Message Function(String name)> codeUnmatchedPatchLibraryMember =
+    const Code<Message Function(String name)>(
+  "UnmatchedPatchLibraryMember",
+);
+
+// DO NOT EDIT. THIS FILE IS GENERATED. SEE TOP OF FILE.
+Message _withArgumentsUnmatchedPatchLibraryMember(String name) {
+  if (name.isEmpty) throw 'No name provided';
+  name = demangleMixinApplicationName(name);
+  return new Message(codeUnmatchedPatchLibraryMember,
+      problemMessage:
+          """Patch member '${name}' doesn't match a member in the origin library.""",
+      correctionMessage: """Try changing the name to an existing member or removing the '@patch' annotation.""",
+      arguments: {'name': name});
+}
+
 // DO NOT EDIT. THIS FILE IS GENERATED. SEE TOP OF FILE.
 const Template<Message Function(String string, Token token)>
     templateUnmatchedToken =

diff --git a/pkg/analysis_server/lib/src/services/correction/bulk_fix_processor.dart b/pkg/analysis_server/lib/src/services/correction/bulk_fix_processor.dart
@@ -519,7 +519,7 @@ class BulkFixProcessor {
     await _applyProducer(context, producer);
     var newHash = computeChangeHash();
     if (newHash != oldHash) {
-      changeMap.add(context.result.path, code.toLowerCase());
+      changeMap.add(context.unitResult.path, code.toLowerCase());
     }
   }