Version 2.18.0-190.0.dev

Merge commit 'd1affb719fa57e999e96703555085d2065a77d29' into 'dev'

Author: Dart CI

CHANGELOG.md

@@ -140,6 +140,13 @@ them, you must set the lower bound on the SDK constraint for your package to
 
 ### Tools
 
+#### Dart command line
+
+- **Breaking change** [#46100](https://github.com/dart-lang/sdk/issues/46100):
+  The standalone `dart2js` and `dartdevc` tools have been removed as previously
+  announced. `dart2js` is replaced by the `dart compile js` command, `dartdevc`
+  is no longer exposed as a command-line tool.
+
 #### Linter
 
 Updated the Linter to `1.25.0`, which includes changes that

DEPS

@@ -105,7 +105,7 @@ vars = {
   # For more details, see https://github.com/dart-lang/sdk/issues/30164.
   "dart_style_rev": "d7b73536a8079331c888b7da539b80e6825270ea",
 
-  "dartdoc_rev": "b61647bc3833302c23bd79f03aa1fbe83578af50",
+  "dartdoc_rev": "58348a98b992ce99b95d23131b67227bdb2b4875",
   "devtools_rev": "51ac983d2db7eb19b3ce5956cb70b769d74fe784",
   "ffi_rev": "0c8364a728cfe4e4ba859c53b99d56b3dbe3add4",
   "file_rev": "0132eeedea2933513bf230513a766a8baeab0c4f",
@@ -114,7 +114,7 @@ vars = {
   "html_rev": "f108bce59d136c584969fd24a5006914796cf213",
   "http_multi_server_rev": "35a3b947256768426090e3b1f5132e4fc23c175d",
   "http_parser_rev": "9126ee04e77fd8e4e2e6435b503ee4dd708d7ddc",
-  "http_rev": "2993ea5dff5ffb066b4a35c707e7a2b8dcfa17c2",
+  "http_rev": "0c2293062d7c1fa472f299da764a7dbb3895ee22",
   "icu_rev": "81d656878ec611cb0b42d52c82e9dae93920d9ba",
   "intl_rev": "9145f308f1458f37630a1ffce3b7d3b471ebbc56",
   "jinja2_rev": "2222b31554f03e62600cd7e383376a7c187967a1",

docs/process/breaking-changes.md

@@ -42,6 +42,12 @@ abide by the following basic conditions:
   documentation (for example, must not mixin a class clearly documented as
   not intended to be used as a mixin).
 
+* Must set an explicit
+  [language version constraint](https://dart.dev/guides/language/evolution#language-versioning)
+  to indicate which version of the language it requires. Incompatibilities
+  introduced in new language versions are not considered breaking as long as
+  the SDK continues to support the older version of the language.
+
 Compatibility is only considered between stable releases (i.e. releases from the
 [Dart stable channel](https://dart.dev/tools/sdk/archive#stable-channel)).
 

pkg/_js_interop_checks/lib/src/transformations/js_util_wasm_optimizer.dart

@@ -49,15 +49,15 @@ class JsUtilWasmOptimizer extends Transformer {
   final Procedure _setPropertyTarget;
   final Procedure _jsifyRawTarget;
   final Procedure _newObjectTarget;
-  final Procedure _wrapDartCallbackTarget;
+  final Procedure _wrapDartFunctionTarget;
   final Procedure _allowInteropTarget;
   final Class _wasmAnyRefClass;
   final Class _objectClass;
   final Class _pragmaClass;
   final Field _pragmaName;
   final Field _pragmaOptions;
   final Member _globalThisMember;
-  int _callbackTrampolineN = 1;
+  int _functionTrampolineN = 1;
 
   final CoreTypes _coreTypes;
   final StatefulStaticTypeContext _staticTypeContext;
@@ -77,8 +77,8 @@ class JsUtilWasmOptimizer extends Transformer {
             .getTopLevelProcedure('dart:js_util', 'setProperty'),
         _jsifyRawTarget = _coreTypes.index
             .getTopLevelProcedure('dart:_js_helper', 'jsifyRaw'),
-        _wrapDartCallbackTarget = _coreTypes.index
-            .getTopLevelProcedure('dart:_js_helper', '_wrapDartCallback'),
+        _wrapDartFunctionTarget = _coreTypes.index
+            .getTopLevelProcedure('dart:_js_helper', '_wrapDartFunction'),
         _newObjectTarget =
             _coreTypes.index.getTopLevelProcedure('dart:js_util', 'newObject'),
         _allowInteropTarget =
@@ -210,11 +210,11 @@ class JsUtilWasmOptimizer extends Transformer {
   /// trampoline expects a Dart callback as its first argument, followed by all
   /// of the arguments to the Dart callback as Dart objects. The trampoline will
   /// cast all incoming Dart objects to the appropriate types, dispatch, and
-  /// then `jsifyRaw` any returned value. [_createCallbackTrampoline] Returns a
+  /// then `jsifyRaw` any returned value. [_createFunctionTrampoline] Returns a
   /// [String] function name representing the name of the wrapping function.
   /// TODO(joshualitt): Share callback trampolines if the [FunctionType]
   /// matches.
-  String _createCallbackTrampoline(Procedure node, FunctionType function) {
+  String _createFunctionTrampoline(Procedure node, FunctionType function) {
     int fileOffset = node.fileOffset;
     Library library = node.enclosingLibrary;
 
@@ -245,11 +245,11 @@ class JsUtilWasmOptimizer extends Transformer {
     // a native JS value before being returned to JS.
     DartType nullableWasmAnyRefType =
         _wasmAnyRefClass.getThisType(_coreTypes, Nullability.nullable);
-    final callbackTrampolineName =
-        '|_callbackTrampoline${_callbackTrampolineN++}';
-    final callbackTrampolineImportName = '\$$callbackTrampolineName';
-    final callbackTrampoline = Procedure(
-        Name(callbackTrampolineName, library),
+    final functionTrampolineName =
+        '|_functionTrampoline${_functionTrampolineN++}';
+    final functionTrampolineImportName = '\$$functionTrampolineName';
+    final functionTrampoline = Procedure(
+        Name(functionTrampolineName, library),
         ProcedureKind.Method,
         FunctionNode(
             ReturnStatement(StaticInvocation(
@@ -268,24 +268,24 @@ class JsUtilWasmOptimizer extends Transformer {
         fileUri: node.fileUri)
       ..fileOffset = fileOffset
       ..isNonNullableByDefault = true;
-    callbackTrampoline.addAnnotation(
+    functionTrampoline.addAnnotation(
         ConstantExpression(InstanceConstant(_pragmaClass.reference, [], {
       _pragmaName.fieldReference: StringConstant('wasm:export'),
       _pragmaOptions.fieldReference:
-          StringConstant(callbackTrampolineImportName)
+          StringConstant(functionTrampolineImportName)
     })));
-    library.addProcedure(callbackTrampoline);
-    return callbackTrampolineImportName;
+    library.addProcedure(functionTrampoline);
+    return functionTrampolineImportName;
   }
 
   /// Lowers a [StaticInvocation] of `allowInterop` to
-  /// [_createCallbackTrampoline] followed by `_wrapDartCallback`.
+  /// [_createFunctionTrampoline] followed by `_wrapDartFunction`.
   StaticInvocation _allowInterop(
       Procedure node, FunctionType type, Expression argument) {
-    String callbackTrampolineName = _createCallbackTrampoline(node, type);
+    String functionTrampolineName = _createFunctionTrampoline(node, type);
     return StaticInvocation(
-        _wrapDartCallbackTarget,
-        Arguments([argument, StringLiteral(callbackTrampolineName)],
+        _wrapDartFunctionTarget,
+        Arguments([argument, StringLiteral(functionTrampolineName)],
             types: [type]));
   }
 

pkg/analysis_server/lib/src/lsp/handlers/handler_completion_resolve.dart

@@ -153,6 +153,7 @@ class CompletionResolveHandler
           filterText: item.filterText,
           insertText: newInsertText,
           insertTextFormat: item.insertTextFormat,
+          insertTextMode: item.insertTextMode,
           textEdit: supportsInsertReplace && insertionRange != replacementRange
               ? Either2<InsertReplaceEdit, TextEdit>.t1(
                   InsertReplaceEdit(

pkg/analysis_server/lib/src/lsp/mapping.dart

@@ -299,6 +299,10 @@ lsp.CompletionItem declarationToCompletionItem(
     label += declaration.parameterNames?.isNotEmpty ?? false ? '(…)' : '()';
   }
 
+  final insertionRange = toRange(lineInfo, replacementOffset, insertLength);
+  final replacementRange =
+      toRange(lineInfo, replacementOffset, replacementLength);
+
   final insertTextInfo = _buildInsertText(
     supportsSnippets: supportsSnippets,
     includeCommitCharacters: includeCommitCharacters,
@@ -325,6 +329,7 @@ lsp.CompletionItem declarationToCompletionItem(
       .contains(lsp.CompletionItemTag.Deprecated);
   final supportsAsIsInsertMode =
       capabilities.completionInsertTextModes.contains(InsertTextMode.asIs);
+  final supportsInsertReplace = capabilities.insertReplaceCompletionRanges;
 
   final completionKind = declarationKindToCompletionItemKind(
       capabilities.completionItemKinds, declaration.kind);
@@ -364,6 +369,20 @@ lsp.CompletionItem declarationToCompletionItem(
     insertTextMode: supportsAsIsInsertMode && isMultilineCompletion
         ? InsertTextMode.asIs
         : null,
+    textEdit: supportsInsertReplace && insertionRange != replacementRange
+        ? Either2<InsertReplaceEdit, TextEdit>.t1(
+            InsertReplaceEdit(
+              insert: insertionRange,
+              replace: replacementRange,
+              newText: insertText,
+            ),
+          )
+        : Either2<InsertReplaceEdit, TextEdit>.t2(
+            TextEdit(
+              range: replacementRange,
+              newText: insertText,
+            ),
+          ),
     // data, used for completionItem/resolve.
     data: lsp.DartSuggestionSetCompletionItemResolutionInfo(
         file: file,

pkg/analysis_server/lib/src/services/correction/dart/add_async.dart

@@ -11,6 +11,8 @@ import 'package:analyzer_plugin/utilities/change_builder/change_builder_core.dar
 import 'package:analyzer_plugin/utilities/fixes/fixes.dart';
 
 class AddAsync extends CorrectionProducer {
+  // todo(pq): consider adding a variation that adds an `await` as well
+
   /// A flag indicating whether this producer is producing a fix in the case
   /// where a function is missing a return at the end.
   final bool isForMissingReturn;

pkg/analysis_server/lib/src/services/correction/error_fix_status.yaml

@@ -1650,7 +1650,7 @@ LintCode.diagnostic_describe_all_properties:
 LintCode.directives_ordering:
   status: hasFix
 LintCode.discarded_futures:
-  status: needsEvaluation
+  status: hasFix
 LintCode.do_not_use_environment:
   status: needsEvaluation
 LintCode.empty_catches:

pkg/analysis_server/lib/src/services/correction/fix_internal.dart

@@ -447,6 +447,9 @@ class FixProcessor extends BaseProcessor {
     LintNames.directives_ordering: [
       OrganizeImports.new,
     ],
+    LintNames.discarded_futures: [
+      AddAsync.new,
+    ],
     LintNames.empty_catches: [
       RemoveEmptyCatch.new,
     ],

pkg/analysis_server/lib/src/services/linter/lint_names.dart

@@ -53,6 +53,7 @@ class LintNames {
   static const String diagnostic_describe_all_properties =
       'diagnostic_describe_all_properties';
   static const String directives_ordering = 'directives_ordering';
+  static const String discarded_futures = 'discarded_futures';
   static const String empty_catches = 'empty_catches';
   static const String empty_constructor_bodies = 'empty_constructor_bodies';
   static const String empty_statements = 'empty_statements';