Replace Uri.scheme == with Uri.isScheme

Use `hasScheme` in place of comparing against the empty string, and
`isScheme` to compare against all other schemes.

TEST=No behavior changes.

Change-Id: Ifc9fd13c6cf37933ebd4a754c4b500dedbcb291b
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/231185
Reviewed-by: Kevin Moore <[email protected]>
Commit-Queue: Nate Bosch <[email protected]>

Author: natebosch

pkg/_fe_analyzer_shared/lib/src/util/libraries_specification.dart

@@ -238,7 +238,7 @@ class LibrariesSpecification {
               _reportError(messageIncludePathIsNotAString(targetName, specUri));
             }
             Uri uri = Uri.parse(path);
-            if (uri.scheme != '' && uri.scheme != 'file') {
+            if (uri.hasScheme && !uri.isScheme('file')) {
               return _reportError(messageUnsupportedUriScheme(path, specUri));
             }
             LibrariesSpecification specification =
@@ -269,7 +269,7 @@ class LibrariesSpecification {
                 uriString, libraryName, targetName, specUri));
           }
           Uri uri = Uri.parse(uriString);
-          if (uri.scheme != '' && uri.scheme != 'file') {
+          if (uri.hasScheme && !uri.isScheme('file')) {
             return _reportError(
                 messageUnsupportedUriScheme(uriString, specUri));
           }

pkg/_fe_analyzer_shared/lib/src/util/resolve_input_uri.dart

@@ -18,7 +18,7 @@ Uri resolveInputUri(String path) {
 
 Uri parseUri(String path) {
   if (path.startsWith("file:")) {
-    if (Uri.base.scheme == "file") {
+    if (Uri.base.isScheme("file")) {
       // The Uri class doesn't handle relative file URIs correctly, the
       // following works around that issue.
       return new Uri(path: Uri.parse("x-$path").path);

pkg/_js_interop_checks/lib/js_interop_checks.dart

@@ -362,7 +362,7 @@ class JsInteropChecks extends RecursiveVisitor {
   /// or a from environment constructor.
   bool _isAllowedExternalUsage(Member member) {
     Uri uri = member.enclosingLibrary.importUri;
-    return uri.scheme == 'dart' &&
+    return uri.isScheme('dart') &&
             _pathsWithAllowedDartExternalUsage.contains(uri.path) ||
         _allowedNativeTestPatterns.any((pattern) => uri.path.contains(pattern));
   }

pkg/analysis_server/lib/src/computer/computer_hover.dart

@@ -82,7 +82,7 @@ class DartUnitHoverComputer {
           if (library != null) {
             var uri = library.source.uri;
             var analysisSession = _unit.declaredElement?.session;
-            if (uri.scheme == 'file' && analysisSession != null) {
+            if (uri.isScheme('file') && analysisSession != null) {
               // for 'file:' URIs, use the path after the project root
               var context = analysisSession.resourceProvider.pathContext;
               var projectRootDir =

pkg/analysis_server/lib/src/domains/completion/available_suggestions.dart

@@ -173,7 +173,7 @@ protocol.ElementKind protocolElementKind(DeclarationKind kind) {
 
 /// Computes the best URI to import [what] into the [unit] library.
 String? _getRelativeFileUri(DartCompletionRequest request, Uri what) {
-  if (what.scheme == 'file') {
+  if (what.isScheme('file')) {
     var pathContext = request.analysisSession.resourceProvider.pathContext;
 
     var libraryPath = request.libraryElement.source.fullName;

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

@@ -43,14 +43,14 @@ class ConvertToPackageImport extends CorrectionProducer {
       }
 
       var importUri = uriSource.uri;
-      if (importUri.scheme != 'package') {
+      if (!importUri.isScheme('package')) {
         return;
       }
 
       // Don't offer to convert a 'package:' URI to itself.
       try {
         var uriContent = importDirective.uriContent;
-        if (uriContent == null || Uri.parse(uriContent).scheme == 'package') {
+        if (uriContent == null || Uri.parse(uriContent).isScheme('package')) {
           return;
         }
       } on FormatException {

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

@@ -45,7 +45,7 @@ class ConvertToRelativeImport extends CorrectionProducer {
 
     // Ignore if the uri is not a package: uri.
     var sourceUri = resolvedResult.uri;
-    if (sourceUri.scheme != 'package') {
+    if (!sourceUri.isScheme('package')) {
       return;
     }
 
@@ -61,7 +61,7 @@ class ConvertToRelativeImport extends CorrectionProducer {
     }
 
     // Ignore if import uri is not a package: uri.
-    if (importUri.scheme != 'package') {
+    if (!importUri.isScheme('package')) {
       return;
     }
 

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

@@ -322,7 +322,7 @@ Map<String, Element> getImportNamespace(ImportElement imp) {
 /// Computes the best URI to import [what] into [from].
 String getLibrarySourceUri(
     path.Context pathContext, LibraryElement from, Uri what) {
-  if (what.scheme == 'file') {
+  if (what.isScheme('file')) {
     var fromFolder = pathContext.dirname(from.source.fullName);
     var relativeFile = pathContext.relative(what.path, from: fromFolder);
     return pathContext.split(relativeFile).join('/');

pkg/analyzer/lib/src/file_system/file_system.dart

@@ -37,5 +37,5 @@ class ResourceUriResolver extends UriResolver {
   Uri restoreAbsolute(Source source) => pathToUri(source.fullName);
 
   /// Return `true` if the given [uri] is a `file` URI.
-  static bool isFileUri(Uri uri) => uri.scheme == FILE_SCHEME;
+  static bool isFileUri(Uri uri) => uri.isScheme(FILE_SCHEME);
 }

pkg/analyzer/lib/src/generated/source.dart

@@ -31,7 +31,7 @@ abstract class BasicSource extends Source {
 
   @Deprecated('Use uri.isScheme("dart") instead')
   @override
-  bool get isInSystemLibrary => uri.scheme == 'dart';
+  bool get isInSystemLibrary => uri.isScheme('dart');
 
   @override
   String get shortName => pathos.basename(fullName);

pkg/analyzer/lib/src/source/package_map_resolver.dart

@@ -79,6 +79,6 @@ class PackageMapUriResolver extends UriResolver {
 
   /// Returns `true` if [uri] is a `package` URI.
   static bool isPackageUri(Uri uri) {
-    return uri.scheme == PACKAGE_SCHEME;
+    return uri.isScheme(PACKAGE_SCHEME);
   }
 }

pkg/analyzer/lib/src/source/source_resource.dart

@@ -80,7 +80,7 @@ class FileSource extends Source {
 
   @Deprecated('Use uri.isScheme("dart") instead')
   @override
-  bool get isInSystemLibrary => uri.scheme == DartUriResolver.DART_SCHEME;
+  bool get isInSystemLibrary => uri.isScheme(DartUriResolver.DART_SCHEME);
 
   @Deprecated('Not used anymore')
   @override

pkg/analyzer/lib/src/workspace/bazel.dart

@@ -83,15 +83,15 @@ class BazelPackageUriResolver extends UriResolver {
   }
 
   Source? _resolveAbsolute(Uri uri) {
-    if (uri.scheme == 'file') {
+    if (uri.isScheme('file')) {
       var path = fileUriToNormalizedPath(_context, uri);
       var pathRelativeToRoot = _workspace._relativeToRoot(path);
       if (pathRelativeToRoot == null) return null;
       var fullFilePath = _context.join(_workspace.root, pathRelativeToRoot);
       var file = _workspace.findFile(fullFilePath);
       return file?.createSource(uri);
     }
-    if (uri.scheme != 'package') {
+    if (!uri.isScheme('package')) {
       return null;
     }
     String uriPath = Uri.decodeComponent(uri.path);

pkg/analyzer/lib/src/workspace/package_build.dart

@@ -73,7 +73,7 @@ class PackageBuildPackageUriResolver extends UriResolver {
 
   @override
   Source? resolveAbsolute(Uri uri) {
-    if (uri.scheme != 'package') {
+    if (!uri.isScheme('package')) {
       return null;
     }
 

pkg/analyzer/lib/src/workspace/workspace.dart

@@ -82,7 +82,7 @@ abstract class WorkspacePackage {
   /// example, the case of a [InSummarySource]). In this case, use
   /// [workspace]'s package URI resolver to fetch the file path.
   String? filePathFromSource(Source source) {
-    if (source.uri.scheme == 'package') {
+    if (source.uri.isScheme('package')) {
       return workspace.packageUriResolver.resolveAbsolute(source.uri)?.fullName;
     } else {
       return source.fullName;

pkg/analyzer/test/generated/test_support.dart

@@ -530,9 +530,9 @@ class TestSourceWithUri extends TestSource {
   @Deprecated('Use Source.uri instead')
   @override
   UriKind get uriKind {
-    if (uri.scheme == 'dart') {
+    if (uri.isScheme('dart')) {
       return UriKind.DART_URI;
-    } else if (uri.scheme == 'package') {
+    } else if (uri.isScheme('package')) {
       return UriKind.PACKAGE_URI;
     }
     return UriKind.FILE_URI;

pkg/analyzer/test/src/dart/analysis/file_state_test.dart

@@ -783,7 +783,7 @@ part of 'a.dart';
       if (file is LibraryCycle) {
         return !file.libraries.any((file) => file.uri.isScheme('dart'));
       } else if (file is FileState) {
-        return file.uri.scheme != 'dart';
+        return !file.uri.isScheme('dart');
       } else if (file == null) {
         return true;
       } else {

pkg/analyzer_cli/lib/src/analyzer_impl.dart

@@ -127,7 +127,7 @@ class AnalyzerImpl {
     files.clear();
     errorsResults.clear();
     var libraryUri = libraryFile.uri;
-    if (libraryUri.scheme == 'package' && libraryUri.pathSegments.isNotEmpty) {
+    if (libraryUri.isScheme('package') && libraryUri.pathSegments.isNotEmpty) {
       _selfPackageName = libraryUri.pathSegments[0];
     }
   }
@@ -177,7 +177,7 @@ class AnalyzerImpl {
 
   /// Determine whether the given URI refers to a package being analyzed.
   bool _isAnalyzedPackage(Uri uri) {
-    if (uri.scheme != 'package' || uri.pathSegments.isEmpty) {
+    if (!uri.isScheme('package') || uri.pathSegments.isEmpty) {
       return false;
     }
     var packageName = uri.pathSegments.first;

pkg/build_integration/lib/file_system/multi_root.dart

@@ -52,7 +52,7 @@ class MultiRootFileSystemEntity implements FileSystemEntity {
       _delegate ??= await _resolveEntity();
 
   Future<FileSystemEntity> _resolveEntity() async {
-    if (uri.scheme == multiRootFileSystem.markerScheme) {
+    if (uri.isScheme(multiRootFileSystem.markerScheme)) {
       if (!uri.isAbsolute) {
         throw new FileSystemException(
             uri, "This MultiRootFileSystem only handles absolutes URIs: $uri");

pkg/build_integration/lib/file_system/single_root.dart

@@ -33,7 +33,7 @@ class SingleRootFileSystem implements FileSystem {
 
   @override
   FileSystemEntity entityForUri(Uri uri) {
-    if (uri.scheme != markerScheme) {
+    if (!uri.isScheme(markerScheme)) {
       throw new FileSystemException(
           uri,
           "This SingleRootFileSystem only handles URIs with the '$markerScheme'"

pkg/compiler/lib/src/compiler.dart

@@ -726,7 +726,7 @@ abstract class Compiler {
   Uri getCanonicalUri(Entity element) {
     Uri libraryUri = _uriFromElement(element);
     if (libraryUri == null) return null;
-    if (libraryUri.scheme == 'package') {
+    if (libraryUri.isScheme('package')) {
       int slashPos = libraryUri.path.indexOf('/');
       if (slashPos != -1) {
         String packageName = libraryUri.path.substring(0, slashPos);

pkg/compiler/lib/src/dart2js.dart

@@ -1102,7 +1102,7 @@ class AbortLeg {
 
 void writeString(Uri uri, String text) {
   if (!enableWriteString) return;
-  if (uri.scheme != 'file') {
+  if (!uri.isScheme('file')) {
     fail('Unhandled scheme ${uri.scheme}.');
   }
   var file = (File(uri.toFilePath())..createSync(recursive: true))

pkg/compiler/lib/src/diagnostics/code_location.dart

@@ -18,7 +18,7 @@ abstract class CodeLocation {
   String relativize(Uri baseUri);
 
   factory CodeLocation(Uri uri) {
-    if (uri.scheme == 'package') {
+    if (uri.isScheme('package')) {
       int slashPos = uri.path.indexOf('/');
       if (slashPos != -1) {
         String packageName = uri.path.substring(0, slashPos);
@@ -42,7 +42,7 @@ class SchemeLocation implements CodeLocation {
 
   @override
   bool inSameLocation(Uri uri) {
-    return this.uri.scheme == uri.scheme;
+    return this.uri.isScheme(uri.scheme);
   }
 
   @override
@@ -62,7 +62,7 @@ class PackageLocation implements CodeLocation {
 
   @override
   bool inSameLocation(Uri uri) {
-    return uri.scheme == 'package' && uri.path.startsWith('$packageName/');
+    return uri.isScheme('package') && uri.path.startsWith('$packageName/');
   }
 
   @override

pkg/compiler/lib/src/elements/entity_utils.dart

@@ -19,17 +19,17 @@ int compareLibrariesUris(Uri a, Uri b) {
   }
 
   // Order: platform < package < other.
-  if (a.scheme == 'dart') {
-    if (b.scheme == 'dart') return byCanonicalUriPath();
+  if (a.isScheme('dart')) {
+    if (b.isScheme('dart')) return byCanonicalUriPath();
     return -1;
   }
-  if (b.scheme == 'dart') return 1;
+  if (b.isScheme('dart')) return 1;
 
-  if (a.scheme == 'package') {
-    if (b.scheme == 'package') return byCanonicalUriPath();
+  if (a.isScheme('package')) {
+    if (b.isScheme('package')) return byCanonicalUriPath();
     return -1;
   }
-  if (b.scheme == 'package') return 1;
+  if (b.isScheme('package')) return 1;
 
   return _compareCanonicalUri(a, b);
 }

pkg/compiler/lib/src/ir/util.dart

@@ -251,7 +251,7 @@ bool containsFreeVariables(ir.DartType type) =>
 
 /// Returns true if [importUri] corresponds to dart:html and related libraries.
 bool _isWebLibrary(Uri importUri) =>
-    importUri.scheme == 'dart' &&
+    importUri.isScheme('dart') &&
         (importUri.path == 'html' ||
             importUri.path == 'svg' ||
             importUri.path == 'indexed_db' ||

pkg/compiler/lib/src/js_backend/annotations.dart

@@ -156,7 +156,7 @@ EnumSet<PragmaAnnotation> processMemberAnnotations(
 
   Uri uri = member.enclosingLibrary.importUri;
   bool platformAnnotationsAllowed =
-      options.testMode || uri.scheme == 'dart' || maybeEnableNative(uri);
+      options.testMode || uri.isScheme('dart') || maybeEnableNative(uri);
 
   for (PragmaAnnotationData data in pragmaAnnotationData) {
     String name = data.name;

pkg/compiler/lib/src/js_backend/backend_usage.dart

@@ -158,7 +158,7 @@ class BackendUsageBuilderImpl implements BackendUsageBuilder {
   bool _isValidBackendUse(Entity element, LibraryEntity library) {
     if (_isValidEntity(element)) return true;
     SourceSpan span = _frontendStrategy.spanFromSpannable(element, element);
-    if (library.canonicalUri.scheme == 'dart' &&
+    if (library.canonicalUri.isScheme('dart') &&
         span.uri.path.contains('_internal/js_runtime/lib/')) {
       // TODO(johnniwinther): We should be more precise about these.
       return true;

pkg/compiler/lib/src/kernel/dart2js_target.dart

@@ -55,7 +55,7 @@ bool allowedNativeTest(Uri uri) {
 
 bool maybeEnableNative(Uri uri) {
   bool allowedDartLibrary() {
-    if (uri.scheme != 'dart') return false;
+    if (!uri.isScheme('dart')) return false;
     return _allowedDartSchemePaths.contains(uri.path);
   }
 
@@ -118,7 +118,7 @@ class Dart2jsTarget extends Target {
   bool allowPlatformPrivateLibraryAccess(Uri importer, Uri imported) =>
       super.allowPlatformPrivateLibraryAccess(importer, imported) ||
       maybeEnableNative(importer) ||
-      (importer.scheme == 'package' &&
+      (importer.isScheme('package') &&
           importer.path.startsWith('dart2js_runtime_metrics/'));
 
   @override

pkg/compiler/lib/src/kernel/front_end_adapter.dart

@@ -23,7 +23,7 @@ class CompilerFileSystem implements fe.FileSystem {
 
   @override
   fe.FileSystemEntity entityForUri(Uri uri) {
-    if (uri.scheme == 'data') {
+    if (uri.isScheme('data')) {
       return fe.DataFileSystemEntity(Uri.base.resolveUri(uri));
     } else {
       return _CompilerFileSystemEntity(uri, this);

pkg/compiler/lib/src/kernel/loader.dart

@@ -269,7 +269,7 @@ class KernelLoaderTask extends CompilerTask {
 
       // Libraries dependencies do not show implicit imports to `dart:core`.
       var dartCore = component.libraries.firstWhere((lib) {
-        return lib.importUri.scheme == 'dart' && lib.importUri.path == 'core';
+        return lib.importUri.isScheme('dart') && lib.importUri.path == 'core';
       });
       search(dartCore);
 

pkg/compiler/lib/src/options.dart

@@ -826,7 +826,7 @@ class CompilerOptions implements DiagnosticOptions {
       return true;
     }
     if (shownPackageWarnings != null) {
-      return uri.scheme == 'package' &&
+      return uri.isScheme('package') &&
           shownPackageWarnings!.contains(uri.pathSegments.first);
     }
     return false;