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);