Merge branch 'master' into Flutter-3.10.6

dart-archive · Jul 13, 2023 · 01a2aba · 01a2aba
2 parents 1ca855c + 9f72876
commit 01a2aba
Show file tree

Hide file tree

Showing 19 changed files with 746 additions and 1,410 deletions.
diff --git a/README.md b/README.md
@@ -37,7 +37,7 @@ to generate Dart code. To install, please run:
 $ dart pub global activate protoc_plugin
 ```
 
-## Initialise Flutter
+## Initialize Flutter
 
 The Flutter SDK needs to be downloaded and setup.
 

diff --git a/analysis_options.yaml b/analysis_options.yaml
@@ -8,9 +8,6 @@ analyzer:
   exclude:
     - doc/generated/**
     - flutter-sdks/**
-    # TODO(https://github.com/dart-lang/dart-pad/issues/1712): This seems to be
-    # hiding ~2 dozen legitimate analysis issues.
-    - lib/src/protos/**
     - local_pub_cache/**
     - project_templates/**
   errors:

diff --git a/lib/src/analysis_server.dart b/lib/src/analysis_server.dart
@@ -313,19 +313,22 @@ abstract class AnalysisServerWrapper {
       final issues = errors.map((error) {
         final issue = proto.AnalysisIssue()
           ..kind = error.severity.toLowerCase()
+          ..code = error.code.toLowerCase()
           ..line = error.location.startLine
+          ..column = error.location.startColumn
           ..message = utils.normalizeFilePaths(error.message)
           ..sourceName = path.basename(error.location.file)
           ..hasFixes = error.hasFix ?? false
           ..charStart = error.location.offset
           ..charLength = error.location.length
-          ..diagnosticMessages.addAll(error.contextMessages?.map((m) =>
-                  proto.DiagnosticMessage(
-                      message: utils.normalizeFilePaths(m.message),
-                      line: m.location.startLine,
-                      charStart: m.location.offset,
-                      charLength: m.location.length)) ??
-              []);
+          ..diagnosticMessages.addAll(
+            error.contextMessages?.map((m) => proto.DiagnosticMessage()
+                  ..message = utils.normalizeFilePaths(m.message)
+                  ..line = m.location.startLine
+                  ..charStart = m.location.offset
+                  ..charLength = m.location.length) ??
+                [],
+          );
 
         if (error.url != null) {
           issue.url = error.url!;

diff --git a/lib/src/common_server_impl.dart b/lib/src/common_server_impl.dart
@@ -254,7 +254,7 @@ class CommonServerImpl {
   Future<proto.VersionResponse> version(proto.VersionRequest _) {
     final packageVersions = getPackageVersions();
     final packageInfos = [
-      for (var packageName in packageVersions.keys)
+      for (final packageName in packageVersions.keys)
         proto.PackageInfo()
           ..name = packageName
           ..version = packageVersions[packageName]!

diff --git a/lib/src/compiler.dart b/lib/src/compiler.dart
@@ -67,7 +67,7 @@ class Compiler {
         sourcesFileList: files.keys.toList(), devMode: _sdk.devMode);
     if (unsupportedImports.isNotEmpty) {
       return CompilationResults(problems: [
-        for (var import in unsupportedImports)
+        for (final import in unsupportedImports)
           CompilationProblem._('unsupported import: ${import.uri.stringValue}'),
       ]);
     }
@@ -155,7 +155,7 @@ class Compiler {
         sourcesFileList: files.keys.toList(), devMode: _sdk.devMode);
     if (unsupportedImports.isNotEmpty) {
       return DDCCompilationResults.failed([
-        for (var import in unsupportedImports)
+        for (final import in unsupportedImports)
           CompilationProblem._('unsupported import: ${import.uri.stringValue}'),
       ]);
     }

diff --git a/lib/src/project_creator.dart b/lib/src/project_creator.dart
@@ -17,7 +17,7 @@ class ProjectCreator {
 
   final String _templatesPath;
 
-  /// The Dart Language Version to use for code using null safety.
+  /// The Dart language version to use.
   final String _dartLanguageVersion;
 
   final File _dependenciesFile;
@@ -180,7 +180,7 @@ ${_sdk.experiments.map((experiment) => '    - $experiment').join('\n')}
     final allVersions =
         parsePubDependenciesFile(dependenciesFile: _dependenciesFile);
     final result = {
-      for (var package in packages) package: allVersions[package] ?? 'any',
+      for (final package in packages) package: allVersions[package] ?? 'any',
     };
 
     // Overwrite with important constraints.
@@ -220,7 +220,7 @@ String createPubspec({
   var content = '''
 name: dartpad_sample
 environment:
-  sdk: $dartLanguageVersion
+  sdk: ^$dartLanguageVersion
 dependencies:
 ''';