Manual roll of Dart SDK from 023ac80cef14 to 2cecb16348e4 (#163621)

DEPS

@@ -56,23 +56,23 @@ vars = {
   # Dart is: https://github.com/dart-lang/sdk/blob/main/DEPS
   # You can use //tools/dart/create_updated_flutter_deps.py to produce
   # updated revision list of existing dependencies.
-  'dart_revision': '023ac80cef146b2ccd96ec813c177432fe1a6fd6',
+  'dart_revision': '2cecb16348e4778844660d5e7d16a96efe3706ec',
 
   # WARNING: DO NOT EDIT MANUALLY
   # The lines between blank lines above and below are generated by a script. See create_updated_flutter_deps.py
   'dart_binaryen_rev': '3f6831c0bd147ae1ae0ab1d9187d37bce7cca38b',
-  'dart_boringssl_rev': '0147d7f28324c5b2923cd1e412e8aaf74124622c',
+  'dart_boringssl_rev': '8c6b0c04f19f5a6a13af3e29a6a4bb6784cb2bd7',
-  'dart_core_rev': 'a896913715f2d8fb86d099b75dbfd02bf0d658a4',
+  'dart_core_rev': '0b2bd3fcd7f3e082f4cc9b14c19ffa93894b85ae',
   'dart_devtools_rev': 'b38abb81337b10c4b675d418e50f82a5fe6a894d',
-  'dart_http_rev': 'b7cdf6136926589210662bbdd71000e7abab7271',
+  'dart_http_rev': '900da9fe7d576caa4882053cf26d3a70bd3106e0',
   'dart_libprotobuf_rev': '24487dd1045c7f3d64a21f38a3f0c06cc4cf2edb',
   'dart_perfetto_rev': '13ce0c9e13b0940d2476cd0cff2301708a9a2e2b',
   'dart_protobuf_gn_rev': 'ca669f79945418f6229e4fef89b666b2a88cbb10',
-  'dart_protobuf_rev': 'd00f905450c562493d918884e02048b7aacc00a3',
+  'dart_protobuf_rev': '610943a3bed70c1c2079af5fca02462df10d223f',
   'dart_pub_rev': '710265bae23ad5860f33287fba10b5c369f19a93',
-  'dart_tools_rev': '30de295e959beaaae7a18d2249a1cddb9053dd02',
+  'dart_tools_rev': 'b51f39d01f5a4af33428a0189cd62595c01e23de',
   'dart_web_rev': 'c2d5f63e9ea4c1409d6e159fc7b92dbcf4dc0d4d',
-  'dart_webdev_rev': '616da45582e008efa114728927eabb498c71f1b7',
+  'dart_webdev_rev': '718c39c3b10f6e77f767d70d1f30f8a6c8262d6f',
   'dart_webkit_inspection_protocol_rev': 'effa75205516757795683d527c3dea9546eb0c32',
 
   'ocmock_rev': 'c4ec0e3a7a9f56cfdbd0aa01f4f97bb4b75c5ef8', # v3.7.1
@@ -313,7 +313,7 @@ deps = {
    Var('dart_git') + '/dart_style.git@21de99ec0ff8ace4d946a746fb427fffd6afa535',
 
   'engine/src/flutter/third_party/dart/third_party/pkg/dartdoc':
-   Var('dart_git') + '/dartdoc.git@e1295863b11c54680bf178ec9c2662a33b0e24be',
+   Var('dart_git') + '/dartdoc.git@f0d2276e57c96717e625964ea0385a30f2237e62',
 
   'engine/src/flutter/third_party/dart/third_party/pkg/glob':
    Var('dart_git') + '/glob.git@043796be996190473b397fa2fecfa34bb91376fb',
@@ -340,7 +340,7 @@ deps = {
    Var('dart_git') + '/pub.git' + '@' + Var('dart_pub_rev'),
 
   'engine/src/flutter/third_party/dart/third_party/pkg/shelf':
-   Var('dart_git') + '/shelf.git@2a7442f7d6d3e63fdc7b387128619b263dcb7e78',
+   Var('dart_git') + '/shelf.git@b39e61196ce555dc1d3a0c3da695228fa6bdebb8',
 
   'engine/src/flutter/third_party/dart/third_party/pkg/tar':
    Var('dart_git') + '/external/github.com/simolus3/tar.git@5a1ea943e70cdf3fa5e1102cdbb9418bd9b4b81a',
@@ -364,7 +364,7 @@ deps = {
    Var('dart_git') + '/external/github.com/google/webkit_inspection_protocol.dart.git' + '@' + Var('dart_webkit_inspection_protocol_rev'),
 
   'engine/src/flutter/third_party/dart/tools/sdks/dart-sdk':
-   {'dep_type': 'cipd', 'packages': [{'package': 'dart/dart-sdk/${{platform}}', 'version': 'git_revision:f863f0b43625eb04539a34d7cc25029ba80dd522'}]},
+   {'dep_type': 'cipd', 'packages': [{'package': 'dart/dart-sdk/${{platform}}', 'version': 'git_revision:a8bfb132c5f7b9555d13ea79eaf0eaa77825824d'}]},
 
   # WARNING: end of dart dependencies list that is cleaned up automatically - see create_updated_flutter_deps.py.
 

engine/src/flutter/ci/licenses_golden/licenses_dart

@@ -1,4 +1,4 @@
-Signature: 6679ceded8fc63a93f9cc7f500e6b333
+Signature: aa632d8c40618d46198943997476248a
 
 ====================================================================================================
 LIBRARY: dart
@@ -4429,6 +4429,8 @@ FILE: ../../../flutter/third_party/dart/runtime/tools/entitlements/dartaotruntim
 FILE: ../../../flutter/third_party/dart/runtime/tools/entitlements/dartaotruntime_product.plist
 FILE: ../../../flutter/third_party/dart/runtime/tools/entitlements/gen_snapshot.plist
 FILE: ../../../flutter/third_party/dart/runtime/tools/entitlements/gen_snapshot_product.plist
+FILE: ../../../flutter/third_party/dart/runtime/tools/entitlements/run_futures_aot.plist
+FILE: ../../../flutter/third_party/dart/runtime/tools/entitlements/run_futures_kernel.plist
 FILE: ../../../flutter/third_party/dart/runtime/tools/entitlements/run_main_aot.plist
 FILE: ../../../flutter/third_party/dart/runtime/tools/entitlements/run_main_kernel.plist
 FILE: ../../../flutter/third_party/dart/runtime/tools/entitlements/run_timer_aot.plist
@@ -4858,7 +4860,7 @@ Exhibit B - "Incompatible With Secondary Licenses" Notice
   This Source Code Form is "Incompatible With Secondary Licenses", as
   defined by the Mozilla Public License, v. 2.0.
 
-You may obtain a copy of this library's Source Code Form from: https://dart.googlesource.com/sdk/+/023ac80cef146b2ccd96ec813c177432fe1a6fd6
+You may obtain a copy of this library's Source Code Form from: https://dart.googlesource.com/sdk/+/2cecb16348e4778844660d5e7d16a96efe3706ec
 /third_party/fallback_root_certificates/
 
 ====================================================================================================

engine/src/flutter/ci/licenses_golden/licenses_flutter

@@ -3970,6 +3970,7 @@ ORIGIN: https://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutt
 ORIGIN: https://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/boringssl/src/include/openssl/pkcs7.h
 ORIGIN: https://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/boringssl/src/include/openssl/pkcs8.h
 ORIGIN: https://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/boringssl/src/include/openssl/pki/certificate.h
+ORIGIN: https://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/boringssl/src/include/openssl/pki/ocsp.h
 ORIGIN: https://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/boringssl/src/include/openssl/pki/signature_verify_cache.h
 ORIGIN: https://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/boringssl/src/include/openssl/pki/verify_error.h
 ORIGIN: https://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/boringssl/src/include/openssl/poly1305.h
@@ -4031,9 +4032,6 @@ ORIGIN: https://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutt
 ORIGIN: https://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/boringssl/src/pki/name_constraints.h
 ORIGIN: https://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/boringssl/src/pki/ocsp.cc
 ORIGIN: https://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/boringssl/src/pki/ocsp.h
-ORIGIN: https://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/boringssl/src/pki/ocsp_revocation_status.h
-ORIGIN: https://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/boringssl/src/pki/ocsp_verify_result.cc
-ORIGIN: https://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/boringssl/src/pki/ocsp_verify_result.h
 ORIGIN: https://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/boringssl/src/pki/parse_certificate.cc
 ORIGIN: https://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/boringssl/src/pki/parse_certificate.h
 ORIGIN: https://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/boringssl/src/pki/parse_name.cc
@@ -5644,6 +5642,7 @@ FILE: ../../../flutter/third_party/boringssl/src/include/openssl/pkcs12.h
 FILE: ../../../flutter/third_party/boringssl/src/include/openssl/pkcs7.h
 FILE: ../../../flutter/third_party/boringssl/src/include/openssl/pkcs8.h
 FILE: ../../../flutter/third_party/boringssl/src/include/openssl/pki/certificate.h
+FILE: ../../../flutter/third_party/boringssl/src/include/openssl/pki/ocsp.h
 FILE: ../../../flutter/third_party/boringssl/src/include/openssl/pki/signature_verify_cache.h
 FILE: ../../../flutter/third_party/boringssl/src/include/openssl/pki/verify.h
 FILE: ../../../flutter/third_party/boringssl/src/include/openssl/pki/verify_error.h
@@ -5714,9 +5713,6 @@ FILE: ../../../flutter/third_party/boringssl/src/pki/name_constraints.cc
 FILE: ../../../flutter/third_party/boringssl/src/pki/name_constraints.h
 FILE: ../../../flutter/third_party/boringssl/src/pki/ocsp.cc
 FILE: ../../../flutter/third_party/boringssl/src/pki/ocsp.h
-FILE: ../../../flutter/third_party/boringssl/src/pki/ocsp_revocation_status.h
-FILE: ../../../flutter/third_party/boringssl/src/pki/ocsp_verify_result.cc
-FILE: ../../../flutter/third_party/boringssl/src/pki/ocsp_verify_result.h
 FILE: ../../../flutter/third_party/boringssl/src/pki/parse_certificate.cc
 FILE: ../../../flutter/third_party/boringssl/src/pki/parse_certificate.h
 FILE: ../../../flutter/third_party/boringssl/src/pki/parse_name.cc

engine/src/flutter/ci/licenses_golden/tool_signature

@@ -1,2 +1,2 @@
-Signature: e68ab8faaca9d0a5ab81c3f98cee7d04
+Signature: c84f698d3be586c08f30d61b87c71a64
 

engine/src/flutter/lib/web_ui/lib/src/engine/text/paragraph.dart

@@ -159,8 +159,8 @@ class ParagraphLine {
   /// ellipsized, this returns [startIndex];
   late final int visibleEndIndex = switch (fragments) {
     [] => startIndex,
-    [...final List<LayoutFragment> rest, EllipsisFragment()] || final List<LayoutFragment> rest =>
+    [...final List<LayoutFragment> rest, EllipsisFragment()] ||
-      rest.last.end,
+    final List<LayoutFragment> rest => rest.last.end,
   };
 
   /// The number of new line characters at the end of the line.

engine/src/flutter/sky/packages/sky_engine/LICENSE

@@ -30222,7 +30222,7 @@ Exhibit B - "Incompatible With Secondary Licenses" Notice
   This Source Code Form is "Incompatible With Secondary Licenses", as
   defined by the Mozilla Public License, v. 2.0.
 
-You may obtain a copy of this library's Source Code Form from: https://dart.googlesource.com/sdk/+/023ac80cef146b2ccd96ec813c177432fe1a6fd6
+You may obtain a copy of this library's Source Code Form from: https://dart.googlesource.com/sdk/+/2cecb16348e4778844660d5e7d16a96efe3706ec
 /third_party/fallback_root_certificates/
 
 --------------------------------------------------------------------------------

engine/src/flutter/tools/engine_tool/lib/src/commands/run_command.dart

@@ -241,10 +241,10 @@ final class RunTarget {
       TargetPlatform.darwinUnspecified ||
       TargetPlatform.darwinX64 ||
       TargetPlatform.linuxX64 ||
-      TargetPlatform.windowsX64 =>
+      TargetPlatform.windowsX64 => 'host_$mode',
-        'host_$mode',
+      TargetPlatform.darwinArm64 ||
-      TargetPlatform.darwinArm64 || TargetPlatform.linuxArm64 || TargetPlatform.windowsArm64 =>
+      TargetPlatform.linuxArm64 ||
-        'host_${mode}_arm64',
+      TargetPlatform.windowsArm64 => 'host_${mode}_arm64',
 
       // WEB
       TargetPlatform.webJavascript => 'chrome_$mode',
@@ -268,8 +268,8 @@ final class RunTarget {
         ),
 
       // FUCHSIA
-      TargetPlatform.fuchsiaArm64 || TargetPlatform.fuchsiaX64 =>
+      TargetPlatform.fuchsiaArm64 ||
-        throw FatalError('Fuchsia is not supported.'),
+      TargetPlatform.fuchsiaX64 => throw FatalError('Fuchsia is not supported.'),
 
       // TESTER
       TargetPlatform.tester => throw FatalError('flutter_tester is not supported.'),
@@ -293,8 +293,8 @@ final class RunTarget {
       TargetPlatform.androidUnspecified ||
       TargetPlatform.androidX86 ||
       TargetPlatform.androidX64 ||
-      TargetPlatform.androidArm64 =>
+      TargetPlatform
-        [Label.parseGn('//flutter/shell/platform/android:android_jar')],
+          .androidArm64 => [Label.parseGn('//flutter/shell/platform/android:android_jar')],
 
       // iOS.
       TargetPlatform.iOSUnspecified || TargetPlatform.iOSX64 || TargetPlatform.iOSArm64 => [
@@ -311,9 +311,8 @@ final class RunTarget {
       ],
 
       // Desktop (Windows).
-      TargetPlatform.windowsX64 || TargetPlatform.windowsArm64 => [
+      TargetPlatform.windowsX64 ||
-        Label.parseGn('//flutter/shell/platform/windows'),
+      TargetPlatform.windowsArm64 => [Label.parseGn('//flutter/shell/platform/windows')],
-      ],
 
       // Web.
       TargetPlatform.webJavascript => [Label.parseGn('//flutter/web_sdk:flutter_web_sdk_archive')],

engine/src/flutter/tools/engine_tool/lib/src/gn.dart

@@ -155,10 +155,8 @@ sealed class BuildTarget {
         // Remove the leading // from the path.
         executable: json.stringList('outputs').first.substring(2),
       ),
-      'shared_library' || 'static_library' => LibraryBuildTarget(
+      'shared_library' ||
-        label: Label.parseGn(label),
+      'static_library' => LibraryBuildTarget(label: Label.parseGn(label), testOnly: testOnly),
-        testOnly: testOnly,
-      ),
       'action' => BuildTarget._parseFromAction(label, testOnly: testOnly, json: json),
       'group' => GroupBuildTarget(
         label: Label.parseGn(label),

engine/src/flutter/tools/licenses/lib/filesystem.dart

@@ -86,7 +86,8 @@ FileType identifyFile(String name, Reader reader) {
           'third_party/icu/source/samples/uresb/sr.txt') || // This specific sample contains non-UTF-8 data (unlike other sr.txt files).
       (path.split(name).reversed.take(2).toList().reversed.join('/') ==
           'builds/detect.mk') || // This specific freetype sample contains non-UTF-8 data (unlike other .mk files).
-      (path.split(name).reversed.take(3).toList().reversed.join('/') == 'third_party/cares/cares.rc')) {
+      (path.split(name).reversed.take(3).toList().reversed.join('/') ==
+          'third_party/cares/cares.rc')) {
     return FileType.latin1Text;
   }
   if (path.split(name).reversed.take(6).toList().reversed.join('/') ==

engine/src/flutter/tools/licenses/lib/patterns.dart

@@ -362,10 +362,10 @@ final List<LicenseFileReferencePattern> csReferencesByFilename = <LicenseFileRef
     fileIndex: 5,
     pattern: RegExp(
       kIndent +
-                  // The " \* " is needed to ensure that both copyright lines start with
+          // The " \* " is needed to ensure that both copyright lines start with
-                  // the comment decoration in the captured match, otherwise it won't be
+          // the comment decoration in the captured match, otherwise it won't be
-                  // stripped from the second line when generating output.
+          // stripped from the second line when generating output.
-                  r'((?: \* Copyright \(C\) 2017 ARM, Inc.\n)?'
+          r'((?: \* Copyright \(C\) 2017 ARM, Inc.\n)?'
                   r'Copyright .+(The .+ Authors)(?:\. +All rights reserved\.)?)\n'
                   r'Use of this source code is governed by a BSD-style license that can be\n'
                   r'found in the Chromium source repository ([^ ]+) file.'
@@ -970,51 +970,52 @@ final List<RegExp> csTemplateLicenses = <RegExp>[
         (r'(?:(?:\1\2?(?: *| -*))? *\n)*' // A version with "// -------" between sections was seen in ffx_spd, hence the -*.
             +
             r'|'
-                r'\1\2 '
+                    r'\1\2 '
-                r'The above copyright notice and this permission notice'
+                    r'The above copyright notice and this permission notice'
-                r'(?: \(including the next paragraph\))? '
+                    r'(?: \(including the next paragraph\))? '
-                r'shall be included in all copies or substantial portions '
+                    r'shall be included in all copies or substantial portions '
-                r'of the (?:Software|Materials)\.'
+                    r'of the (?:Software|Materials)\.'
-                r'|'
+                    r'|'
-                r'\1\2 '
+                    r'\1\2 '
-                r'The above copyright notice including the dates of first publication and either this '
+                    r'The above copyright notice including the dates of first publication and either this '
-                r'permission notice or a reference to .+ shall be '
+                    r'permission notice or a reference to .+ shall be '
-                r'included in all copies or substantial portions of the Software.'
+                    r'included in all copies or substantial portions of the Software.'
-                r'|'
+                    r'|'
-                r'\1\2 '
+                    r'\1\2 '
-                r'In addition, the following condition applies:'
+                    r'In addition, the following condition applies:'
-                r'|'
+                    r'|'
-                r'\1\2 '
+                    r'\1\2 '
-                r'All redistributions must retain an intact copy of this copyright notice and disclaimer\.'
+                    r'All redistributions must retain an intact copy of this copyright notice and disclaimer\.'
-                r'|'
+                    r'|'
-                r'\1\2 '
+                    r'\1\2 '
-                r'MODIFICATIONS TO THIS FILE MAY MEAN IT NO LONGER ACCURATELY REFLECTS KHRONOS '
+                    r'MODIFICATIONS TO THIS FILE MAY MEAN IT NO LONGER ACCURATELY REFLECTS KHRONOS '
-                r'STANDARDS. THE UNMODIFIED, NORMATIVE VERSIONS OF KHRONOS SPECIFICATIONS AND '
+                    r'STANDARDS. THE UNMODIFIED, NORMATIVE VERSIONS OF KHRONOS SPECIFICATIONS AND '
-                r'HEADER INFORMATION ARE LOCATED AT https://www\.khronos\.org/registry/'
+                    r'HEADER INFORMATION ARE LOCATED AT https://www\.khronos\.org/registry/'
-                r'|'
+                    r'|'
-                r'\1\2 '
+                    r'\1\2 '
-                r'THE (?:SOFTWARE|MATERIALS) (?:IS|ARE) PROVIDED "AS -? IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS '
+                    r'THE (?:SOFTWARE|MATERIALS) (?:IS|ARE) PROVIDED "AS -? IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS '
-                r'OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, '
+                    r'OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, '
-                r'FITNESS FOR A PARTICULAR PURPOSE AND NON-?INFRINGEMENT\. IN NO EVENT SHALL '
+                    r'FITNESS FOR A PARTICULAR PURPOSE AND NON-?INFRINGEMENT\. IN NO EVENT SHALL '
-                r'.+(?: .+)? BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER '
+                    r'.+(?: .+)? BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER '
-                r'IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,(?: )?OUT OF OR IN '
+                    r'IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,(?: )?OUT OF OR IN '
-                r'CONNECTION WITH THE (?:SOFTWARE|MATERIALS) OR THE USE OR OTHER DEALINGS IN THE (?:SOFTWARE|MATERIALS)\.'
+                    r'CONNECTION WITH THE (?:SOFTWARE|MATERIALS) OR THE USE OR OTHER DEALINGS IN THE (?:SOFTWARE|MATERIALS)\.'
-                r'|'
+                    r'|'
-                r'\1\2 '
+                    r'\1\2 '
-                r'THE (?:SOFTWARE|MATERIALS) (?:IS|ARE) PROVIDED "AS -? IS" AND WITHOUT WARRANTY OF ANY KIND, '
+                    r'THE (?:SOFTWARE|MATERIALS) (?:IS|ARE) PROVIDED "AS -? IS" AND WITHOUT WARRANTY OF ANY KIND, '
-                r'EXPRESS, IMPLIED OR OTHERWISE, INCLUDING WITHOUT LIMITATION, ANY WARRANTY OF MERCHANTABILITY '
+                    r'EXPRESS, IMPLIED OR OTHERWISE, INCLUDING WITHOUT LIMITATION, ANY WARRANTY OF MERCHANTABILITY '
-                r'OR FITNESS FOR A PARTICULAR PURPOSE\.'
+                    r'OR FITNESS FOR A PARTICULAR PURPOSE\.'
-                r'|'
+                    r'|'
-                r'\1\2 '
+                    r'\1\2 '
-                r'IN NO EVENT SHALL .+ BE LIABLE FOR ANY SPECIAL, INCIDENTAL, INDIRECT OR CONSEQUENTIAL '
+                    r'IN NO EVENT SHALL .+ BE LIABLE FOR ANY SPECIAL, INCIDENTAL, INDIRECT OR CONSEQUENTIAL '
-                r'DAMAGES OF ANY KIND, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, '
+                    r'DAMAGES OF ANY KIND, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, '
-                r'WHETHER OR NOT ADVISED OF THE POSSIBILITY OF DAMAGE, AND ON ANY THEORY OF LIABILITY, ARISING '
+                    r'WHETHER OR NOT ADVISED OF THE POSSIBILITY OF DAMAGE, AND ON ANY THEORY OF LIABILITY, ARISING '
-                r'OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE\.'
+                    r'OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE\.'
-                r'|'
+                    r'|'
-                r'\1\2 '
+                    r'\1\2 '
-                r'Except as contained in this notice, the name of .+ shall not '
+                    r'Except as contained in this notice, the name of .+ shall not '
-                r'be used in advertising or otherwise to promote the sale, use or other dealings in '
+                    r'be used in advertising or otherwise to promote the sale, use or other dealings in '
-                r'this Software without prior written authorization from .+\.'.replaceAll(' ', _linebreak)) +
+                    r'this Software without prior written authorization from .+\.'
+                .replaceAll(' ', _linebreak)) +
         r')*',
     multiLine: true,
     caseSensitive: false,