add uri compare, microsoft#93368

jrieken · jrieken · commit e8e6b13f10f9 · 2020-05-14T18:08:52.000+02:00
diff --git a/src/vs/base/common/resources.ts b/src/vs/base/common/resources.ts
@@ -6,7 +6,7 @@
 import * as extpath from 'vs/base/common/extpath';
 import * as paths from 'vs/base/common/path';
 import { URI, uriToFsPath } from 'vs/base/common/uri';
-import { equalsIgnoreCase } from 'vs/base/common/strings';
+import { equalsIgnoreCase, compare as strCompare, compareIgnoreCase } from 'vs/base/common/strings';
 import { Schemas } from 'vs/base/common/network';
 import { isLinux, isWindows } from 'vs/base/common/platform';
 import { CharCode } from 'vs/base/common/charCode';
@@ -60,6 +60,28 @@ export function isEqual(first: URI | undefined, second: URI | undefined, caseIns
 	return (p1 === p2 || caseInsensitivePath && equalsIgnoreCase(p1, p2)) && first.query === second.query && (ignoreFragment || first.fragment === second.fragment);
 }
 
+export function compare(uri1: URI, uri2: URI, caseInsensitivePath: boolean = _hasToIgnoreCase(uri1), ignoreFragment: boolean = false): number {
+	// scheme
+	let ret = strCompare(uri1.scheme, uri2.scheme);
+	if (ret === 0) {
+		// authority
+		ret = compareIgnoreCase(uri1.authority, uri2.authority);
+		if (ret === 0) {
+			// path
+			ret = caseInsensitivePath ? compareIgnoreCase(uri1.path, uri2.path) : strCompare(uri1.path, uri2.path);
+			// query
+			if (ret === 0) {
+				ret = strCompare(uri1.query, uri2.query);
+				// fragment
+				if (ret === 0 && !ignoreFragment) {
+					ret = strCompare(uri1.fragment, uri2.fragment);
+				}
+			}
+		}
+	}
+	return ret;
+}
+
 /**
  * Tests whether a `candidate` URI is a parent or equal of a given `base` URI.
  *
diff --git a/src/vs/base/test/common/resources.test.ts b/src/vs/base/test/common/resources.test.ts
@@ -3,7 +3,7 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 import * as assert from 'assert';
-import { dirname, basename, distinctParents, joinPath, isEqual, isEqualOrParent, normalizePath, isAbsolutePath, relativePath, removeTrailingPathSeparator, hasTrailingPathSeparator, resolvePath, addTrailingPathSeparator, getComparisonKey } from 'vs/base/common/resources';
+import { dirname, basename, distinctParents, joinPath, isEqual, isEqualOrParent, normalizePath, isAbsolutePath, relativePath, removeTrailingPathSeparator, hasTrailingPathSeparator, resolvePath, addTrailingPathSeparator, getComparisonKey, compare } from 'vs/base/common/resources';
 import { URI } from 'vs/base/common/uri';
 import { isWindows } from 'vs/base/common/platform';
 import { toSlashes } from 'vs/base/common/extpath';
@@ -348,6 +348,7 @@ suite('Resources', () => {
 
 	function assertIsEqual(u1: URI, u2: URI, ignoreCase: boolean | undefined, expected: boolean) {
 		assert.equal(isEqual(u1, u2, ignoreCase), expected, `${u1.toString()}${expected ? '===' : '!=='}${u2.toString()}`);
+		assert.equal(compare(u1, u2, ignoreCase) === 0, expected);
 		assert.equal(getComparisonKey(u1, ignoreCase) === getComparisonKey(u2, ignoreCase), expected, `comparison keys ${u1.toString()}, ${u2.toString()}`);
 		assert.equal(isEqualOrParent(u1, u2, ignoreCase), expected, `isEqualOrParent ${u1.toString()}, ${u2.toString()}`);
 	}
