@zzzen/pyright-internal 1.2.0-dev.20240317 → 1.2.0-dev.20240331

package/dist/tests/uri.test.js

@@ -43,273 +43,284 @@ const realFileSystem_1 = require("../common/realFileSystem");
 const uri_1 = require("../common/uri/uri");
 const uriUtils_1 = require("../common/uri/uriUtils");
 const vfs = __importStar(require("./harness/vfs/filesystem"));
+const testHost_1 = require("./harness/testHost");
+const caseDetector = new testHost_1.TestCaseSensitivityDetector(true);
 test('parse', () => {
-    assert_1.default.throws(() => uri_1.Uri.parse('\\c:\\foo : bar', true));
-    assert_1.default.throws(() => uri_1.Uri.parse('foo:////server/b/c', true)); // No authority component
-    assert_1.default.ok(uri_1.Uri.parse('foo:///a/b/c', true));
-    assert_1.default.ok(uri_1.Uri.parse('foo:a/b/c', true));
-    assert_1.default.ok(uri_1.Uri.parse('foo:/a/b/c', true));
-    assert_1.default.ok(uri_1.Uri.parse('foo://server/share/dir/file.py', true));
-    assert_1.default.ok(uri_1.Uri.parse('foo://server/share/dir/file.py?query#fragment', true));
-    assert_1.default.ok(uri_1.Uri.parse('foo:///c:/users/me', true));
-    assert_1.default.ok(uri_1.Uri.parse('foo:///c%3A%52users%52me', true));
-    assert_1.default.ok(uri_1.Uri.parse('', true));
-    assert_1.default.ok(uri_1.Uri.parse(undefined, true));
+    assert_1.default.throws(() => uri_1.Uri.parse('\\c:\\foo : bar', caseDetector));
+    assert_1.default.throws(() => uri_1.Uri.parse('foo:////server/b/c', caseDetector)); // No authority component
+    assert_1.default.ok(uri_1.Uri.parse('foo:///a/b/c', caseDetector));
+    assert_1.default.ok(uri_1.Uri.parse('foo:a/b/c', caseDetector));
+    assert_1.default.ok(uri_1.Uri.parse('foo:/a/b/c', caseDetector));
+    assert_1.default.ok(uri_1.Uri.parse('foo://server/share/dir/file.py', caseDetector));
+    assert_1.default.ok(uri_1.Uri.parse('foo://server/share/dir/file.py?query#fragment', caseDetector));
+    assert_1.default.ok(uri_1.Uri.parse('foo:///c:/users/me', caseDetector));
+    assert_1.default.ok(uri_1.Uri.parse('foo:///c%3A%52users%52me', caseDetector));
+    assert_1.default.ok(uri_1.Uri.parse('', caseDetector));
+    assert_1.default.ok(uri_1.Uri.parse(undefined, caseDetector));
 });
 test('file', () => {
     const cwd = process.cwd();
-    const uri1 = uri_1.Uri.file('a/b/c', true, true);
+    const uri1 = uri_1.Uri.file('a/b/c', caseDetector, true);
     assert_1.default.ok(uri1.getFilePath().length > 6);
     assert_1.default.ok(uri1.getFilePath().toLowerCase().startsWith(cwd.toLowerCase()), `${uri1.getFilePath()} does not start with ${cwd}`);
-    const uri2 = uri_1.Uri.file('a/b/c', true, false);
+    const uri2 = uri_1.Uri.file('a/b/c', caseDetector, false);
     assert_1.default.equal(uri2.getFilePath().length, 6);
 });
+test('file path', () => {
+    // parse works with unix style file format
+    assert_1.default.equal(uri_1.Uri.parse('/folder1/folder2', caseDetector).scheme, 'file');
+    // parse doesn't work with window style file format
+    (0, assert_1.default)(uri_1.Uri.parse('c:\\folder1\\folder2', caseDetector).scheme !== `file`);
+    // file works with both styles
+    assert_1.default.equal(uri_1.Uri.file('/folder1/folder2', caseDetector).scheme, 'file');
+    assert_1.default.equal(uri_1.Uri.file('c:\\folder1\\folder2', caseDetector).scheme, 'file');
+});
 test('key', () => {
-    const key = uri_1.Uri.parse('foo:///a/b/c', true).key;
-    const key2 = uri_1.Uri.parse('foo:///a/b/c', true).key;
+    const key = uri_1.Uri.parse('foo:///a/b/c', caseDetector).key;
+    const key2 = uri_1.Uri.parse('foo:///a/b/c', caseDetector).key;
     assert_1.default.equal(key, key2);
-    const key3 = uri_1.Uri.parse('foo:///a/b/d', true).key;
+    const key3 = uri_1.Uri.parse('foo:///a/b/d', caseDetector).key;
     assert_1.default.notEqual(key, key3);
-    const key4 = uri_1.Uri.file('/a/b/c').key;
+    const key4 = uriUtils_1.UriEx.file('/a/b/c').key;
     assert_1.default.notEqual(key, key4);
-    const key5 = uri_1.Uri.parse('file:///a/b/c', true).key;
+    const key5 = uri_1.Uri.parse('file:///a/b/c', caseDetector).key;
     assert_1.default.equal(key4, key5);
-    const key6 = uri_1.Uri.file((0, pathUtils_1.normalizeSlashes)('c:\\foo\\bar\\d.txt')).key;
-    const key7 = uri_1.Uri.parse('file:///c%3A/foo/bar/d.txt', true).key;
-    const key8 = uri_1.Uri.parse('file:///c:/foo/bar/d.txt', true).key;
+    const key6 = uriUtils_1.UriEx.file((0, pathUtils_1.normalizeSlashes)('c:\\foo\\bar\\d.txt')).key;
+    const key7 = uri_1.Uri.parse('file:///c%3A/foo/bar/d.txt', caseDetector).key;
+    const key8 = uri_1.Uri.parse('file:///c:/foo/bar/d.txt', caseDetector).key;
     assert_1.default.equal(key6, key7);
     assert_1.default.equal(key6, key8);
-    const key9 = uri_1.Uri.parse('file:///c%3A/foo/bar/D.txt', true).key;
-    const key10 = uri_1.Uri.parse('file:///c:/foo/bar/d.txt', true).key;
+    const key9 = uriUtils_1.UriEx.parse('file:///c%3A/foo/bar/D.txt', true).key;
+    const key10 = uriUtils_1.UriEx.parse('file:///c:/foo/bar/d.txt', true).key;
     assert_1.default.notEqual(key9, key10);
-    const key11 = uri_1.Uri.parse('file:///c%3A/foo/bar/D.txt', false).key;
-    const key12 = uri_1.Uri.parse('file:///c%3A/foo/bar/d.txt', false).key;
+    const key11 = uriUtils_1.UriEx.parse('file:///c%3A/foo/bar/D.txt', false).key;
+    const key12 = uriUtils_1.UriEx.parse('file:///c%3A/foo/bar/d.txt', false).key;
     assert_1.default.equal(key11, key12);
 });
 test('filename', () => {
-    const filename = uri_1.Uri.parse('foo:///a/b/c', true).fileName;
+    const filename = uri_1.Uri.parse('foo:///a/b/c', caseDetector).fileName;
     assert_1.default.equal(filename, 'c');
-    const filename2 = uri_1.Uri.parse('foo:///a/b/c/', true).fileName;
+    const filename2 = uri_1.Uri.parse('foo:///a/b/c/', caseDetector).fileName;
     assert_1.default.equal(filename2, 'c');
-    const filename3 = uri_1.Uri.parse('foo:///a/b/c.py', true).fileName;
+    const filename3 = uri_1.Uri.parse('foo:///a/b/c.py', caseDetector).fileName;
     assert_1.default.equal(filename3, 'c.py');
-    const filename4 = uri_1.Uri.parse('foo:///a/b/c.py?query#fragment', true).fileName;
+    const filename4 = uri_1.Uri.parse('foo:///a/b/c.py?query#fragment', caseDetector).fileName;
     assert_1.default.equal(filename4, 'c.py');
-    const filename5 = uri_1.Uri.file('/a/b/c').fileName;
+    const filename5 = uriUtils_1.UriEx.file('/a/b/c').fileName;
     assert_1.default.equal(filename5, 'c');
-    const filename6 = uri_1.Uri.parse('file:///a/b/c', true).fileName;
+    const filename6 = uri_1.Uri.parse('file:///a/b/c', caseDetector).fileName;
     assert_1.default.equal(filename6, 'c');
 });
 test('extname', () => {
-    const extname = uri_1.Uri.parse('foo:///a/b/c', true).lastExtension;
+    const extname = uri_1.Uri.parse('foo:///a/b/c', caseDetector).lastExtension;
     assert_1.default.equal(extname, '');
-    const extname2 = uri_1.Uri.parse('foo:///a/b/c/', true).lastExtension;
+    const extname2 = uri_1.Uri.parse('foo:///a/b/c/', caseDetector).lastExtension;
     assert_1.default.equal(extname2, '');
-    const extname3 = uri_1.Uri.parse('foo:///a/b/c.py', true).lastExtension;
+    const extname3 = uri_1.Uri.parse('foo:///a/b/c.py', caseDetector).lastExtension;
     assert_1.default.equal(extname3, '.py');
-    const extname4 = uri_1.Uri.parse('foo:///a/b/c.py?query#fragment', true).lastExtension;
+    const extname4 = uri_1.Uri.parse('foo:///a/b/c.py?query#fragment', caseDetector).lastExtension;
     assert_1.default.equal(extname4, '.py');
-    const extname5 = uri_1.Uri.file('/a/b/c.py.foo').lastExtension;
+    const extname5 = uriUtils_1.UriEx.file('/a/b/c.py.foo').lastExtension;
     assert_1.default.equal(extname5, '.foo');
-    const extname6 = uri_1.Uri.parse('file:///a/b/c.py.foo', true).lastExtension;
+    const extname6 = uri_1.Uri.parse('file:///a/b/c.py.foo', caseDetector).lastExtension;
     assert_1.default.equal(extname6, '.foo');
 });
 test('fragment', () => {
-    const fragment = uri_1.Uri.parse('foo:///a/b/c#bar', true).fragment;
+    const fragment = uri_1.Uri.parse('foo:///a/b/c#bar', caseDetector).fragment;
     assert_1.default.equal(fragment, 'bar');
-    const fragment2 = uri_1.Uri.parse('foo:///a/b/c#bar#baz', true).fragment;
+    const fragment2 = uri_1.Uri.parse('foo:///a/b/c#bar#baz', caseDetector).fragment;
     assert_1.default.equal(fragment2, 'bar#baz');
-    const fragment3 = uri_1.Uri.parse('foo:///a/b/c?query#bar#baz', true).fragment;
+    const fragment3 = uri_1.Uri.parse('foo:///a/b/c?query#bar#baz', caseDetector).fragment;
     assert_1.default.equal(fragment3, 'bar#baz');
-    const fragment4 = uri_1.Uri.parse('foo:///a/b/c?query', true).fragment;
+    const fragment4 = uri_1.Uri.parse('foo:///a/b/c?query', caseDetector).fragment;
     assert_1.default.equal(fragment4, '');
-    const fragment5 = uri_1.Uri.parse('foo:///a/b/c', true).withFragment('bar').fragment;
+    const fragment5 = uri_1.Uri.parse('foo:///a/b/c', caseDetector).withFragment('bar').fragment;
     assert_1.default.equal(fragment5, 'bar');
-    const fragment6 = uri_1.Uri.parse('foo:///a/b/c#bar', true).withFragment('').fragment;
+    const fragment6 = uri_1.Uri.parse('foo:///a/b/c#bar', caseDetector).withFragment('').fragment;
     assert_1.default.equal(fragment6, '');
 });
 test('query', () => {
-    const query = uri_1.Uri.parse('foo:///a/b/c?bar', true).query;
+    const query = uri_1.Uri.parse('foo:///a/b/c?bar', caseDetector).query;
     assert_1.default.equal(query, 'bar');
-    const query2 = uri_1.Uri.parse('foo:///a/b/c?bar?baz', true).query;
+    const query2 = uri_1.Uri.parse('foo:///a/b/c?bar?baz', caseDetector).query;
     assert_1.default.equal(query2, 'bar?baz');
-    const query3 = uri_1.Uri.parse('foo:///a/b/c?bar?baz#fragment', true).query;
+    const query3 = uri_1.Uri.parse('foo:///a/b/c?bar?baz#fragment', caseDetector).query;
     assert_1.default.equal(query3, 'bar?baz');
-    const query4 = uri_1.Uri.parse('foo:///a/b/c#fragment', true).query;
+    const query4 = uri_1.Uri.parse('foo:///a/b/c#fragment', caseDetector).query;
     assert_1.default.equal(query4, '');
-    const query5 = uri_1.Uri.parse('foo:///a/b/c', true).withQuery('bar').query;
+    const query5 = uri_1.Uri.parse('foo:///a/b/c', caseDetector).withQuery('bar').query;
     assert_1.default.equal(query5, 'bar');
-    const query6 = uri_1.Uri.parse('foo:///a/b/c?bar', true).withQuery('').query;
+    const query6 = uri_1.Uri.parse('foo:///a/b/c?bar', caseDetector).withQuery('').query;
     assert_1.default.equal(query6, '');
 });
 test('containsExtension', () => {
-    const uri1 = uri_1.Uri.parse('foo:///a/b/c.py', true);
+    const uri1 = uriUtils_1.UriEx.parse('foo:///a/b/c.py', true);
     assert_1.default.ok(uri1.containsExtension('.py'));
     assert_1.default.ok(!uri1.containsExtension('.PY'));
     assert_1.default.ok(!uri1.containsExtension('.pyi'));
-    const uri2 = uri_1.Uri.parse('foo:///a/b/c.pyi', true);
+    const uri2 = uriUtils_1.UriEx.parse('foo:///a/b/c.pyi', true);
     assert_1.default.ok(uri2.containsExtension('.pyi'));
     assert_1.default.ok(!uri2.containsExtension('.PYI'));
     assert_1.default.ok(!uri2.containsExtension('.py'));
-    const uri3 = uri_1.Uri.parse('foo:///a/b/c.pyi.ipynb', false);
+    const uri3 = uriUtils_1.UriEx.parse('foo:///a/b/c.pyi.ipynb', false);
     assert_1.default.ok(uri3.containsExtension('.pyi'));
     assert_1.default.ok(uri3.containsExtension('.ipynb'));
     assert_1.default.ok(!uri3.containsExtension('.PYI'));
 });
 test('root', () => {
-    const root1 = uri_1.Uri.parse('foo://authority/a/b/c', true).root;
+    const root1 = uriUtils_1.UriEx.parse('foo://authority/a/b/c').root;
     assert_1.default.equal(root1.toString(), 'foo://authority/');
-    const root = uri_1.Uri.parse('file://server/b/c', true).root;
+    const root = uriUtils_1.UriEx.parse('file://server/b/c').root;
     assert_1.default.equal(root.toString(), 'file://server/');
     assert_1.default.equal(root.getRootPathLength(), 9);
-    const root2 = uri_1.Uri.parse('foo:/', true).root;
+    const root2 = uriUtils_1.UriEx.parse('foo:/').root;
     assert_1.default.equal(root2.toString(), 'foo:/');
-    const root3 = uri_1.Uri.parse('foo://a/b/c/', true).root;
+    const root3 = uriUtils_1.UriEx.parse('foo://a/b/c/').root;
     assert_1.default.equal(root3.toString(), 'foo://a/');
     assert_1.default.ok(root3.isRoot());
-    const root4 = uri_1.Uri.parse('foo://a/b/c.py', true).root;
+    const root4 = uriUtils_1.UriEx.parse('foo://a/b/c.py').root;
     assert_1.default.equal(root4.toString(), 'foo://a/');
-    const root5 = uri_1.Uri.parse('foo://a/b/c.py?query#fragment', true).root;
+    const root5 = uriUtils_1.UriEx.parse('foo://a/b/c.py?query#fragment').root;
     assert_1.default.equal(root5.toString(), 'foo://a/');
-    const root6 = uri_1.Uri.file('/a/b/c.py.foo').root;
+    const root6 = uriUtils_1.UriEx.file('/a/b/c.py.foo').root;
     assert_1.default.equal(root6.toString(), 'file:///');
-    const root7 = uri_1.Uri.parse('file:///a/b/c.py.foo', true).root;
+    const root7 = uriUtils_1.UriEx.parse('file:///a/b/c.py.foo').root;
     assert_1.default.equal(root7.toString(), 'file:///');
     assert_1.default.equal(root7.getRootPathLength(), 1);
-    const root8 = uri_1.Uri.parse('untitled:Untitled-1', true).root;
+    const root8 = uriUtils_1.UriEx.parse('untitled:Untitled-1').root;
     assert_1.default.equal(root8.toString(), 'untitled:');
     assert_1.default.equal(root8.getRootPathLength(), 0);
     assert_1.default.equal(root8.isRoot(), false);
-    const root9 = uri_1.Uri.parse('file://a/b/c/d.py', true).root;
+    const root9 = uriUtils_1.UriEx.parse('file://a/b/c/d.py').root;
     assert_1.default.equal(root9.toString(), 'file://a/');
     assert_1.default.equal(root9.getRootPathLength(), 4);
     assert_1.default.ok(root9.isRoot());
-    const root10 = uri_1.Uri.parse('file://c%3A/b/c/d.py', true).root;
+    const root10 = uriUtils_1.UriEx.parse('file://c%3A/b/c/d.py').root;
     assert_1.default.equal(root10.toString(), 'file://c:/');
     assert_1.default.equal(root10.getRootPathLength(), 5);
     assert_1.default.ok(root10.isRoot());
 });
 test('untitled', () => {
-    const untitled = uri_1.Uri.parse('untitled:Untitled-1', true);
+    const untitled = uriUtils_1.UriEx.parse('untitled:Untitled-1', true);
     assert_1.default.equal(untitled.scheme, 'untitled');
     assert_1.default.equal(untitled.fileName, 'Untitled-1');
     assert_1.default.equal(untitled.toString(), 'untitled:Untitled-1');
-    const untitled2 = uri_1.Uri.parse('untitled:Untitled-1', true);
+    const untitled2 = uriUtils_1.UriEx.parse('untitled:Untitled-1', true);
     assert_1.default.ok(untitled.equals(untitled2));
-    const untitled3 = uri_1.Uri.parse('untitled:Untitled-2', true);
+    const untitled3 = uriUtils_1.UriEx.parse('untitled:Untitled-2', true);
     assert_1.default.ok(!untitled.equals(untitled3));
-    const untitled4 = uri_1.Uri.parse('untitled:Untitled-1.foo.bar', false);
+    const untitled4 = uriUtils_1.UriEx.parse('untitled:Untitled-1.foo.bar', false);
     assert_1.default.equal(untitled4.scheme, 'untitled');
     assert_1.default.equal(untitled4.fileName, 'Untitled-1.foo.bar');
     (0, assert_1.default)(untitled4.containsExtension('.foo'));
     (0, assert_1.default)(untitled4.containsExtension('.bar'));
 });
 test('empty', () => {
-    const empty = uri_1.Uri.parse('', true);
+    const empty = uri_1.Uri.parse('', caseDetector);
     assert_1.default.equal(empty.isEmpty(), true);
-    const empty2 = uri_1.Uri.parse('foo:///', true).isEmpty();
+    const empty2 = uri_1.Uri.parse('foo:///', caseDetector).isEmpty();
     assert_1.default.equal(empty2, false);
     const empty3 = uri_1.Uri.empty();
     assert_1.default.equal(empty3.isEmpty(), true);
-    const empty4 = uri_1.Uri.parse(undefined, true);
+    const empty4 = uri_1.Uri.parse(undefined, caseDetector);
     assert_1.default.equal(empty4.isEmpty(), true);
     assert_1.default.ok(empty4.equals(empty3));
     assert_1.default.ok(empty3.equals(empty));
     const combined = empty.combinePaths((0, pathUtils_1.normalizeSlashes)('/d/e/f'));
-    assert_1.default.equal(combined.getFilePath(), (0, pathUtils_1.normalizeSlashes)('/d/e/f'));
+    assert_1.default.equal(combined.getFilePath(), '');
 });
 test('file', () => {
-    const file1 = uri_1.Uri.file((0, pathUtils_1.normalizeSlashes)('/a/b/c')).getFilePath();
+    const file1 = uriUtils_1.UriEx.file((0, pathUtils_1.normalizeSlashes)('/a/b/c')).getFilePath();
     assert_1.default.equal(file1, (0, pathUtils_1.normalizeSlashes)('/a/b/c'));
-    const file2 = uri_1.Uri.file('file:///a/b/c').getFilePath();
+    const file2 = uriUtils_1.UriEx.file('file:///a/b/c').getFilePath();
     assert_1.default.equal(file2, (0, pathUtils_1.normalizeSlashes)('/a/b/c'));
-    const resolved = uri_1.Uri.file((0, pathUtils_1.normalizeSlashes)('/a/b/c')).combinePaths((0, pathUtils_1.normalizeSlashes)('/d/e/f'));
+    const resolved = uriUtils_1.UriEx.file((0, pathUtils_1.normalizeSlashes)('/a/b/c')).combinePaths((0, pathUtils_1.normalizeSlashes)('/d/e/f'));
     assert_1.default.equal(resolved.getFilePath(), (0, pathUtils_1.normalizeSlashes)('/d/e/f'));
 });
 test('isUri', () => {
-    const isUri = uri_1.Uri.isUri('foo:///a/b/c');
+    const isUri = uri_1.Uri.is('foo:///a/b/c');
     assert_1.default.equal(isUri, false);
-    const isUri2 = uri_1.Uri.isUri('/a/b/c');
+    const isUri2 = uri_1.Uri.is('/a/b/c');
     assert_1.default.equal(isUri2, false);
-    const isUri3 = uri_1.Uri.isUri(undefined);
+    const isUri3 = uri_1.Uri.is(undefined);
     assert_1.default.equal(isUri3, false);
-    const isUri4 = uri_1.Uri.isUri(uri_1.Uri.parse('foo:///a/b/c', true));
+    const isUri4 = uri_1.Uri.is(uri_1.Uri.parse('foo:///a/b/c', caseDetector));
     assert_1.default.equal(isUri4, true);
-    const isUri5 = uri_1.Uri.isUri(uri_1.Uri.empty());
+    const isUri5 = uri_1.Uri.is(uri_1.Uri.empty());
     assert_1.default.equal(isUri5, true);
 });
 test('matchesRegex', () => {
     const includeFiles = /\.pyi?$/;
-    const uri = uri_1.Uri.parse('file:///a/b/c.pyi', true);
+    const uri = uri_1.Uri.parse('file:///a/b/c.pyi', caseDetector);
     assert_1.default.ok(uri.matchesRegex(includeFiles));
-    const uri2 = uri_1.Uri.parse('file:///a/b/c.px', true);
+    const uri2 = uri_1.Uri.parse('file:///a/b/c.px', caseDetector);
     assert_1.default.equal(uri2.matchesRegex(includeFiles), false);
-    const uri3 = uri_1.Uri.parse('vscode-vfs:///a/b/c.pyi', true);
+    const uri3 = uri_1.Uri.parse('vscode-vfs:///a/b/c.pyi', caseDetector);
     assert_1.default.ok(uri3.matchesRegex(includeFiles));
     const fileRegex = /^(c:\/foo\/bar)($|\/)/i;
-    const uri4 = uri_1.Uri.parse('file:///C%3A/foo/bar', true);
+    const uri4 = uri_1.Uri.parse('file:///C%3A/foo/bar', caseDetector);
     assert_1.default.ok(uri4.matchesRegex(fileRegex));
-    const uri5 = uri_1.Uri.parse('file:///c%3A/foo/bar', true);
+    const uri5 = uri_1.Uri.parse('file:///c%3A/foo/bar', caseDetector);
     assert_1.default.ok(uri5.matchesRegex(fileRegex));
-    const uri6 = uri_1.Uri.parse('file:///c:/foo/bar', true);
+    const uri6 = uri_1.Uri.parse('file:///c:/foo/bar', caseDetector);
     assert_1.default.ok(uri6.matchesRegex(fileRegex));
-    const uri7 = uri_1.Uri.parse('file:///c:/foo/bar/', true);
+    const uri7 = uri_1.Uri.parse('file:///c:/foo/bar/', caseDetector);
     assert_1.default.ok(uri7.matchesRegex(fileRegex));
-    const uri8 = uri_1.Uri.parse('file:///c:/foo/baz/', true);
+    const uri8 = uri_1.Uri.parse('file:///c:/foo/baz/', caseDetector);
     assert_1.default.equal(uri8.matchesRegex(fileRegex), false);
 });
 test('replaceExtension', () => {
-    const uri = uri_1.Uri.parse('file:///a/b/c.pyi', true);
+    const uri = uri_1.Uri.parse('file:///a/b/c.pyi', caseDetector);
     const uri2 = uri.replaceExtension('.py');
     assert_1.default.equal(uri2.toString(), 'file:///a/b/c.py');
-    const uri3 = uri_1.Uri.parse('file:///a/b/c', true);
+    const uri3 = uri_1.Uri.parse('file:///a/b/c', caseDetector);
     const uri4 = uri3.replaceExtension('.py');
     assert_1.default.equal(uri4.toString(), 'file:///a/b/c.py');
-    const uri5 = uri_1.Uri.parse('file:///a/b/c.foo.py', true);
+    const uri5 = uri_1.Uri.parse('file:///a/b/c.foo.py', caseDetector);
     const uri6 = uri5.replaceExtension('.pyi');
     assert_1.default.equal(uri6.toString(), 'file:///a/b/c.foo.pyi');
-    const uri7 = uri_1.Uri.parse('memfs:/notebook.ipynb.py?query#fragment', true);
+    const uri7 = uri_1.Uri.parse('memfs:/notebook.ipynb.py?query#fragment', caseDetector);
     const uri8 = uri7.replaceExtension('');
     assert_1.default.equal(uri8.toString(), 'memfs:/notebook.ipynb');
-    const uri9 = uri_1.Uri.parse('untitled:Untitled-1.ipynb.py?query#fragment', true);
+    const uri9 = uri_1.Uri.parse('untitled:Untitled-1.ipynb.py?query#fragment', caseDetector);
     const uri10 = uri9.replaceExtension('');
     assert_1.default.equal(uri10.toString(), 'untitled:Untitled-1.ipynb');
 });
 test('addExtension', () => {
-    const uri = uri_1.Uri.parse('file:///a/b/c.pyi?query#fragment', true);
+    const uri = uri_1.Uri.parse('file:///a/b/c.pyi?query#fragment', caseDetector);
     const uri2 = uri.addExtension('.py');
     assert_1.default.equal(uri2.toString(), 'file:///a/b/c.pyi.py');
-    const uri3 = uri_1.Uri.parse('file:///a/b/c', true);
+    const uri3 = uri_1.Uri.parse('file:///a/b/c', caseDetector);
     const uri4 = uri3.addExtension('.py');
     assert_1.default.equal(uri4.toString(), 'file:///a/b/c.py');
 });
 test('addPath', () => {
-    const uri = uri_1.Uri.parse('file:///a/b/c.pyi?query#fragment', true);
+    const uri = uri_1.Uri.parse('file:///a/b/c.pyi?query#fragment', caseDetector);
     const uri2 = uri.addPath('d');
     assert_1.default.equal(uri2.toString(), 'file:///a/b/c.pyid');
 });
 test('getDirectory', () => {
-    const uri = uri_1.Uri.parse('file:///a/b/c.pyi?query#fragment', true);
+    const uri = uri_1.Uri.parse('file:///a/b/c.pyi?query#fragment', caseDetector);
     const uri2 = uri.getDirectory();
     assert_1.default.equal(uri2.toString(), 'file:///a/b');
     const uri3 = uri2.getDirectory();
     assert_1.default.equal(uri3.toString(), 'file:///a');
-    const uri4 = uri_1.Uri.parse('file:///a/b/', true);
+    const uri4 = uri_1.Uri.parse('file:///a/b/', caseDetector);
     const uri5 = uri4.getDirectory();
     assert_1.default.equal(uri5.toString(), 'file:///a');
     const uri6 = uri4.getDirectory();
     assert_1.default.ok(uri6.equals(uri5));
     const uri7 = uri5.getDirectory();
     assert_1.default.equal(uri7.toString(), 'file:///');
-    const uri8 = uri_1.Uri.parse('memfs:/a', true);
+    const uri8 = uri_1.Uri.parse('memfs:/a', caseDetector);
     const uri9 = uri8.getDirectory();
     assert_1.default.equal(uri9.toString(), 'memfs:/');
-    const uri10 = uri_1.Uri.parse('untitled:a', true);
+    const uri10 = uri_1.Uri.parse('untitled:a', caseDetector);
     const uri11 = uri10.getDirectory();
     assert_1.default.equal(uri11.toString(), 'untitled:');
 });
 test('init and pytyped', () => {
-    const uri = uri_1.Uri.parse('file:///a/b/c?query#fragment', true);
+    const uri = uri_1.Uri.parse('file:///a/b/c?query#fragment', caseDetector);
     const uri2 = uri.pytypedUri;
     assert_1.default.equal(uri2.toString(), 'file:///a/b/c/py.typed');
     const uri3 = uri.initPyUri;
@@ -320,7 +331,7 @@ test('init and pytyped', () => {
     assert_1.default.equal(uri5.toString(), 'file:///a/b/c.py');
     const uri6 = uri.packageStubUri;
     assert_1.default.equal(uri6.toString(), 'file:///a/b/c.pyi');
-    const uri7 = uri_1.Uri.parse('foo://microsoft.com/a/b/c.py', true);
+    const uri7 = uri_1.Uri.parse('foo://microsoft.com/a/b/c.py', caseDetector);
     const uri8 = uri7.pytypedUri;
     assert_1.default.equal(uri8.toString(), 'foo://microsoft.com/a/b/c.py/py.typed');
     const uri9 = uri7.initPyUri;
@@ -333,69 +344,69 @@ test('init and pytyped', () => {
     assert_1.default.equal(uri12.toString(), 'foo://microsoft.com/a/b/c.py.pyi');
 });
 test('isChild', () => {
-    const parent = uri_1.Uri.parse('file:///a/b/?query#fragment', true);
-    const child = uri_1.Uri.parse('file:///a/b/c.pyi?query#fragment', true);
+    const parent = uriUtils_1.UriEx.parse('file:///a/b/?query#fragment', true);
+    const child = uriUtils_1.UriEx.parse('file:///a/b/c.pyi?query#fragment', true);
     assert_1.default.ok(child.isChild(parent));
-    const parent2 = uri_1.Uri.parse('file:///a/b', true);
-    const child2 = uri_1.Uri.parse('file:///a/b/c.pyi', true);
-    const child2DifferentCase = uri_1.Uri.parse('file:///a/B/C.pyi', false);
+    const parent2 = uriUtils_1.UriEx.parse('file:///a/b', true);
+    const child2 = uriUtils_1.UriEx.parse('file:///a/b/c.pyi', true);
+    const child2DifferentCase = uriUtils_1.UriEx.parse('file:///a/B/C.pyi', false);
     assert_1.default.ok(child2.isChild(parent2));
     assert_1.default.ok(child2DifferentCase.isChild(parent2));
-    const parent3 = uri_1.Uri.parse('file:///a/b/', true);
-    const child3 = uri_1.Uri.parse('file:///a/b/c.pyi', true);
+    const parent3 = uriUtils_1.UriEx.parse('file:///a/b/', true);
+    const child3 = uriUtils_1.UriEx.parse('file:///a/b/c.pyi', true);
     assert_1.default.ok(child3.isChild(parent3));
-    const parent4 = uri_1.Uri.parse('file:///a/b/', true);
-    const notChild4 = uri_1.Uri.parse('file:///a/bb/c.pyi', true);
+    const parent4 = uriUtils_1.UriEx.parse('file:///a/b/', true);
+    const notChild4 = uriUtils_1.UriEx.parse('file:///a/bb/c.pyi', true);
     assert_1.default.ok(!notChild4.isChild(parent4));
     assert_1.default.ok(!notChild4.isChild(parent2));
-    const notChild5 = uri_1.Uri.parse('file:///a/b/', true);
+    const notChild5 = uriUtils_1.UriEx.parse('file:///a/b/', true);
     assert_1.default.ok(!notChild5.isChild(parent4));
 });
 test('equals', () => {
-    const uri1 = uri_1.Uri.parse('file:///a/b/c.pyi?query#fragment', true);
-    const uri2 = uri_1.Uri.file('/a/b/c.pyi');
+    const uri1 = uriUtils_1.UriEx.parse('file:///a/b/c.pyi?query#fragment', true);
+    const uri2 = uriUtils_1.UriEx.file('/a/b/c.pyi');
     assert_1.default.ok(!uri1.equals(uri2));
     const uri3 = uri1.stripExtension().addExtension('.pyi');
     assert_1.default.ok(uri2.equals(uri3));
-    const uri4 = uri_1.Uri.parse('foo:///a/b/c', true);
-    const uri5 = uri_1.Uri.parse('foo:///a/b/c', true);
-    const uri6 = uri_1.Uri.parse('foo:///a/b/c/', true);
+    const uri4 = uriUtils_1.UriEx.parse('foo:///a/b/c', true);
+    const uri5 = uriUtils_1.UriEx.parse('foo:///a/b/c', true);
+    const uri6 = uriUtils_1.UriEx.parse('foo:///a/b/c/', true);
     assert_1.default.ok(uri4.equals(uri5));
     assert_1.default.ok(uri4.equals(uri6));
-    const uri7 = uri_1.Uri.parse('file://c%3A/b/c/d.py', true).root;
-    const uri8 = uri_1.Uri.parse('file://c:/', true);
+    const uri7 = uriUtils_1.UriEx.parse('file://c%3A/b/c/d.py', true).root;
+    const uri8 = uriUtils_1.UriEx.parse('file://c:/', true);
     assert_1.default.ok(uri7.equals(uri8));
-    const uri9 = uri_1.Uri.parse('foo:///a/b/c?query', true);
+    const uri9 = uriUtils_1.UriEx.parse('foo:///a/b/c?query', true);
     assert_1.default.ok(!uri9.equals(uri4));
     // Web uris are always case sensitive
-    const uri10 = uri_1.Uri.parse('foo:///a/b/c', false);
-    const uri11 = uri_1.Uri.parse('foo:///a/B/c', false);
+    const uri10 = uriUtils_1.UriEx.parse('foo:///a/b/c', false);
+    const uri11 = uriUtils_1.UriEx.parse('foo:///a/B/c', false);
     assert_1.default.ok(!uri10.equals(uri11));
     // Filre uris pay attention to the parameter.
-    const uri12 = uri_1.Uri.parse('file:///a/b/c', false);
-    const uri13 = uri_1.Uri.parse('file:///a/B/c', false);
+    const uri12 = uriUtils_1.UriEx.parse('file:///a/b/c', false);
+    const uri13 = uriUtils_1.UriEx.parse('file:///a/B/c', false);
     assert_1.default.ok(uri12.equals(uri13));
-    const uri14 = uri_1.Uri.parse('file:///a/b/c', true);
-    const uri15 = uri_1.Uri.parse('file:///a/B/c', true);
+    const uri14 = uriUtils_1.UriEx.parse('file:///a/b/c', true);
+    const uri15 = uriUtils_1.UriEx.parse('file:///a/B/c', true);
     assert_1.default.ok(!uri14.equals(uri15));
 });
 test('startsWith', () => {
-    const parent = uri_1.Uri.parse('file:///a/b/?query#fragment', true);
-    const child = uri_1.Uri.parse('file:///a/b/c.pyi?query#fragment', true);
+    const parent = uri_1.Uri.parse('file:///a/b/?query#fragment', caseDetector);
+    const child = uri_1.Uri.parse('file:///a/b/c.pyi?query#fragment', caseDetector);
     assert_1.default.ok(child.startsWith(parent));
-    const parent2 = uri_1.Uri.parse('file:///a/b', true);
-    const child2 = uri_1.Uri.parse('file:///a/b/c.pyi', true);
+    const parent2 = uri_1.Uri.parse('file:///a/b', caseDetector);
+    const child2 = uri_1.Uri.parse('file:///a/b/c.pyi', caseDetector);
     assert_1.default.ok(child2.startsWith(parent2));
-    const parent3 = uri_1.Uri.parse('file:///a/b/', true);
-    const child3 = uri_1.Uri.parse('file:///a/b/c.pyi', true);
+    const parent3 = uri_1.Uri.parse('file:///a/b/', caseDetector);
+    const child3 = uri_1.Uri.parse('file:///a/b/c.pyi', caseDetector);
     assert_1.default.ok(child3.startsWith(parent3));
-    const parent4 = uri_1.Uri.parse('file:///a/b/', true);
-    const notChild4 = uri_1.Uri.parse('file:///a/bb/c.pyi', true);
+    const parent4 = uri_1.Uri.parse('file:///a/b/', caseDetector);
+    const notChild4 = uri_1.Uri.parse('file:///a/bb/c.pyi', caseDetector);
     assert_1.default.ok(!notChild4.startsWith(parent4));
     assert_1.default.ok(!notChild4.startsWith(parent2));
 });
 test('path comparisons', () => {
-    const uri = uri_1.Uri.parse('foo:///a/b/c.pyi?query#fragment', true);
+    const uri = uri_1.Uri.parse('foo:///a/b/c.pyi?query#fragment', caseDetector);
     assert_1.default.ok(uri.pathEndsWith('c.pyi'));
     assert_1.default.ok(uri.pathEndsWith('b/c.pyi'));
     assert_1.default.ok(uri.pathEndsWith('a/b/c.pyi'));
@@ -404,7 +415,7 @@ test('path comparisons', () => {
     assert_1.default.ok(uri.pathIncludes('c.pyi'));
     assert_1.default.ok(uri.pathIncludes('b/c'));
     assert_1.default.ok(uri.pathIncludes('a/b/c'));
-    const uri2 = uri_1.Uri.parse('file:///C%3A/a/b/c.pyi?query#fragment', true);
+    const uri2 = uri_1.Uri.parse('file:///C%3A/a/b/c.pyi?query#fragment', caseDetector);
     assert_1.default.ok(uri2.pathEndsWith('c.pyi'));
     assert_1.default.ok(uri2.pathEndsWith('b/c.pyi'));
     assert_1.default.ok(!uri2.pathStartsWith('C:/a'));
@@ -413,7 +424,7 @@ test('path comparisons', () => {
     assert_1.default.ok(uri2.pathStartsWith('c:/a/b'));
 });
 test('combinePaths', () => {
-    const uri1 = uri_1.Uri.parse('file:///a/b/c.pyi?query#fragment', true);
+    const uri1 = uri_1.Uri.parse('file:///a/b/c.pyi?query#fragment', caseDetector);
     const uri2 = uri1.combinePaths('d', 'e');
     assert_1.default.equal(uri2.toString(), 'file:///a/b/c.pyi/d/e');
     const uri4 = uri1.combinePaths('d', 'e', 'f');
@@ -424,19 +435,19 @@ test('combinePaths', () => {
     const rootedResult = process.platform === 'win32' ? 'file:///d%3A/e/f' : 'file:///D/e/f';
     const uri6 = uri1.combinePaths(rootedPath, 'e', 'f');
     assert_1.default.equal(uri6.toString(), rootedResult);
-    const uri7 = uri_1.Uri.parse('foo:', true);
+    const uri7 = uri_1.Uri.parse('foo:', caseDetector);
     const uri8 = uri7.combinePaths('d', 'e');
     assert_1.default.equal(uri8.toString(), 'foo:d/e');
-    const uri9 = uri_1.Uri.parse('foo:/', true);
+    const uri9 = uri_1.Uri.parse('foo:/', caseDetector);
     const uri10 = uri9.combinePaths('d', 'e');
     assert_1.default.equal(uri10.toString(), 'foo:/d/e');
     const uri11 = uri_1.Uri.empty().combinePaths('d', 'e');
-    assert_1.default.equal(uri11.toString(), uri_1.Uri.file((0, pathUtils_1.normalizeSlashes)('/d/e')).toString());
+    assert_1.default.equal(uri11.toString(), '');
     const uri12 = uri1.combinePaths('d', 'e', 'f/');
     assert_1.default.equal(uri12.toString(), 'file:///a/b/c.pyi/d/e/f');
 });
 test('combinePathsUnsafe', () => {
-    const uri1 = uri_1.Uri.parse('file:///a/b/c.pyi?query#fragment', true);
+    const uri1 = uri_1.Uri.parse('file:///a/b/c.pyi?query#fragment', caseDetector);
     const uri2 = uri1.combinePathsUnsafe('d', 'e');
     assert_1.default.equal(uri2.toString(), 'file:///a/b/c.pyi/d/e');
     const uri4 = uri1.combinePathsUnsafe('d', 'e', 'f');
@@ -447,19 +458,19 @@ test('combinePathsUnsafe', () => {
     const rootedResult = process.platform === 'win32' ? 'file:///d%3A/e/f' : 'file:///D/e/f';
     const uri6 = uri1.combinePathsUnsafe(rootedPath, 'e', 'f');
     assert_1.default.equal(uri6.toString(), rootedResult);
-    const uri7 = uri_1.Uri.parse('foo:', true);
+    const uri7 = uri_1.Uri.parse('foo:', caseDetector);
     const uri8 = uri7.combinePathsUnsafe('d', 'e');
     assert_1.default.equal(uri8.toString(), 'foo:d/e');
-    const uri9 = uri_1.Uri.parse('foo:/', true);
+    const uri9 = uri_1.Uri.parse('foo:/', caseDetector);
     const uri10 = uri9.combinePathsUnsafe('d', 'e');
     assert_1.default.equal(uri10.toString(), 'foo:/d/e');
     const uri11 = uri_1.Uri.empty().combinePathsUnsafe('d', 'e');
-    assert_1.default.equal(uri11.toString(), uri_1.Uri.file((0, pathUtils_1.normalizeSlashes)('/d/e')).toString());
+    assert_1.default.equal(uri11.toString(), '');
     const uri12 = uri1.combinePathsUnsafe('d', 'e', 'f/');
     assert_1.default.equal(uri12.toString(), 'file:///a/b/c.pyi/d/e/f/');
 });
 test('resolvePaths', () => {
-    const uri1 = uri_1.Uri.parse('file:///a/b/c.pyi?query#fragment', true);
+    const uri1 = uri_1.Uri.parse('file:///a/b/c.pyi?query#fragment', caseDetector);
     const uri2 = uri1.resolvePaths('d', 'e');
     assert_1.default.equal(uri2.toString(), 'file:///a/b/c.pyi/d/e');
     const uri3 = uri1.resolvePaths('d', 'e/');
@@ -472,24 +483,24 @@ test('resolvePaths', () => {
     const rootedResult = process.platform === 'win32' ? 'file:///d%3A/e/f' : 'file:///D/e/f';
     const uri6 = uri1.resolvePaths(rootedPath, 'e', 'f');
     assert_1.default.equal(uri6.toString(), rootedResult);
-    const uri7 = uri_1.Uri.parse('foo:', true);
+    const uri7 = uri_1.Uri.parse('foo:', caseDetector);
     const uri8 = uri7.resolvePaths('d', 'e');
     assert_1.default.equal(uri8.toString(), 'foo:d/e');
-    const uri9 = uri_1.Uri.parse('foo:/', true);
+    const uri9 = uri_1.Uri.parse('foo:/', caseDetector);
     const uri10 = uri9.resolvePaths('d', 'e');
     assert_1.default.equal(uri10.toString(), 'foo:/d/e');
     const uri11 = uri_1.Uri.empty().resolvePaths('d', 'e');
-    assert_1.default.equal(uri11.toString(), uri_1.Uri.file((0, pathUtils_1.normalizeSlashes)('/d/e')).toString());
+    assert_1.default.equal(uri11.toString(), '');
 });
 test('combinePaths non file', () => {
-    const uri1 = uri_1.Uri.parse('baz://authority/a/b/c.pyi?query#fragment', true);
+    const uri1 = uri_1.Uri.parse('baz://authority/a/b/c.pyi?query#fragment', caseDetector);
     const uri2 = uri1.combinePaths('d', 'e');
     assert_1.default.equal(uri2.toString(), 'baz://authority/a/b/c.pyi/d/e');
     const uri4 = uri1.combinePaths('d', 'e', 'f');
     assert_1.default.equal(uri4.toString(), 'baz://authority/a/b/c.pyi/d/e/f');
 });
 test('resolvePaths non file', () => {
-    const uri1 = uri_1.Uri.parse('baz://authority/a/b/c.pyi?query#fragment', true);
+    const uri1 = uri_1.Uri.parse('baz://authority/a/b/c.pyi?query#fragment', caseDetector);
     const uri2 = uri1.resolvePaths('d', 'e');
     assert_1.default.equal(uri2.toString(), 'baz://authority/a/b/c.pyi/d/e');
     const uri3 = uri1.resolvePaths('d', 'e/');
@@ -500,36 +511,36 @@ test('resolvePaths non file', () => {
     assert_1.default.equal(uri5.toString(), 'baz://authority/a/b/c.pyi/e');
 });
 test('getPathComponents1', () => {
-    const components = uri_1.Uri.parse('', true).getPathComponents();
+    const components = uri_1.Uri.parse('', caseDetector).getPathComponents();
     assert_1.default.equal(components.length, 0);
 });
 test('getPathComponents2', () => {
-    const components = uri_1.Uri.parse('/users/', true).getPathComponents();
+    const components = uri_1.Uri.parse('/users/', caseDetector).getPathComponents();
     assert_1.default.equal(components.length, 2);
     assert_1.default.equal(components[0], '/');
     assert_1.default.equal(components[1], 'users');
 });
 test('getPathComponents3', () => {
-    const components = uri_1.Uri.parse('/users/hello.py', true).getPathComponents();
+    const components = uri_1.Uri.parse('/users/hello.py', caseDetector).getPathComponents();
     assert_1.default.equal(components.length, 3);
     assert_1.default.equal(components[0], '/');
     assert_1.default.equal(components[1], 'users');
     assert_1.default.equal(components[2], 'hello.py');
 });
 test('getPathComponents4', () => {
-    const components = uri_1.Uri.parse('/users/hello/../', true).getPathComponents();
+    const components = uri_1.Uri.parse('/users/hello/../', caseDetector).getPathComponents();
     assert_1.default.equal(components.length, 2);
     assert_1.default.equal(components[0], '/');
     assert_1.default.equal(components[1], 'users');
 });
 test('getPathComponents5', () => {
-    const components = uri_1.Uri.parse('./hello.py', true).getPathComponents();
+    const components = uri_1.Uri.parse('./hello.py', caseDetector).getPathComponents();
     assert_1.default.equal(components.length, 2);
     assert_1.default.equal(components[0], '/');
     assert_1.default.equal(components[1], 'hello.py');
 });
 test('getPathComponents6', () => {
-    const components = uri_1.Uri.parse('file://server/share/dir/file.py', true).getPathComponents();
+    const components = uri_1.Uri.parse('file://server/share/dir/file.py', caseDetector).getPathComponents();
     assert_1.default.equal(components.length, 4);
     assert_1.default.ok(components[0].slice(2).includes('server'));
     assert_1.default.equal(components[1], 'share');
@@ -537,104 +548,104 @@ test('getPathComponents6', () => {
     assert_1.default.equal(components[3], 'file.py');
 });
 test('getRelativePathComponents1', () => {
-    const components = uri_1.Uri.parse('foo:///users/', true).getRelativePathComponents(uri_1.Uri.parse('foo:///users/', true));
+    const components = uri_1.Uri.parse('foo:///users/', caseDetector).getRelativePathComponents(uri_1.Uri.parse('foo:///users/', caseDetector));
     assert_1.default.equal(components.length, 0);
 });
 test('getRelativePathComponents2', () => {
-    const components = uri_1.Uri.parse('foo:///users/', true).getRelativePathComponents(uri_1.Uri.parse('foo:///users/bar', true));
+    const components = uri_1.Uri.parse('foo:///users/', caseDetector).getRelativePathComponents(uri_1.Uri.parse('foo:///users/bar', caseDetector));
     assert_1.default.equal(components.length, 1);
     assert_1.default.equal(components[0], 'bar');
 });
 test('getRelativePathComponents3', () => {
-    const components = uri_1.Uri.parse('bar:///users/', true).getRelativePathComponents(uri_1.Uri.parse('foo:///users/bar', true));
+    const components = uri_1.Uri.parse('bar:///users/', caseDetector).getRelativePathComponents(uri_1.Uri.parse('foo:///users/bar', caseDetector));
     assert_1.default.equal(components.length, 1);
     assert_1.default.equal(components[0], 'bar');
 });
 test('getRelativePathComponents4', () => {
-    const components = uri_1.Uri.parse('foo:///users', true).getRelativePathComponents(uri_1.Uri.parse('foo:///users/', true));
+    const components = uri_1.Uri.parse('foo:///users', caseDetector).getRelativePathComponents(uri_1.Uri.parse('foo:///users/', caseDetector));
     assert_1.default.equal(components.length, 0);
 });
 test('getRelativePathComponents5', () => {
-    const components = uri_1.Uri.parse('foo:///users/', true).getRelativePathComponents(uri_1.Uri.parse('foo:///users/bar/baz/../foo', true));
+    const components = uri_1.Uri.parse('foo:///users/', caseDetector).getRelativePathComponents(uri_1.Uri.parse('foo:///users/bar/baz/../foo', caseDetector));
     assert_1.default.equal(components.length, 2);
     assert_1.default.equal(components[0], 'bar');
     assert_1.default.equal(components[1], 'foo');
 });
 test('getRelativePathComponents6', () => {
-    const components = uri_1.Uri.parse('foo:///users/bar', true).getRelativePathComponents(uri_1.Uri.parse('foo:///users/foo', true));
+    const components = uri_1.Uri.parse('foo:///users/bar', caseDetector).getRelativePathComponents(uri_1.Uri.parse('foo:///users/foo', caseDetector));
     assert_1.default.equal(components.length, 2);
     assert_1.default.equal(components[0], '..');
     assert_1.default.equal(components[1], 'foo');
 });
 test('getRelativePathComponents7', () => {
-    const components = uri_1.Uri.file('\\\\SERVER\\share\\users', false).getRelativePathComponents(uri_1.Uri.file('\\\\server\\ShArE\\users\\bar', false));
+    const components = uriUtils_1.UriEx.file('\\\\SERVER\\share\\users', false).getRelativePathComponents(uriUtils_1.UriEx.file('\\\\server\\ShArE\\users\\bar', false));
     assert_1.default.equal(components.length, 1);
     assert_1.default.equal(components[0], 'bar');
 });
 test('getFileExtension1', () => {
-    const ext = uri_1.Uri.parse('foo:///blah.blah/hello.JsOn', true).lastExtension;
+    const ext = uri_1.Uri.parse('foo:///blah.blah/hello.JsOn', caseDetector).lastExtension;
     assert_1.default.equal(ext, '.JsOn');
 });
 test('getFileName1', () => {
-    const fileName = uri_1.Uri.parse('foo:///blah.blah/HeLLo.JsOn', true).fileName;
+    const fileName = uri_1.Uri.parse('foo:///blah.blah/HeLLo.JsOn', caseDetector).fileName;
     assert_1.default.equal(fileName, 'HeLLo.JsOn');
 });
 test('getFileName2', () => {
-    const fileName1 = uri_1.Uri.parse('foo:///blah.blah/hello.cpython-32m.so', true).fileName;
+    const fileName1 = uri_1.Uri.parse('foo:///blah.blah/hello.cpython-32m.so', caseDetector).fileName;
     assert_1.default.equal(fileName1, 'hello.cpython-32m.so');
 });
 test('stripFileExtension1', () => {
-    const path = uri_1.Uri.parse('foo:///blah.blah/HeLLo.JsOn', true).stripExtension().getPath();
+    const path = uri_1.Uri.parse('foo:///blah.blah/HeLLo.JsOn', caseDetector).stripExtension().getPath();
     assert_1.default.equal(path, '/blah.blah/HeLLo');
 });
 test('stripFileExtension2', () => {
-    const path1 = uri_1.Uri.parse('foo:/blah.blah/hello.cpython-32m.so', true).stripAllExtensions().getPath();
+    const path1 = uri_1.Uri.parse('foo:/blah.blah/hello.cpython-32m.so', caseDetector).stripAllExtensions().getPath();
     assert_1.default.equal(path1, '/blah.blah/hello');
-    const path2 = uri_1.Uri.parse('foo:/blah.blah/hello.cpython-32m.so', true).stripExtension().getPath();
+    const path2 = uri_1.Uri.parse('foo:/blah.blah/hello.cpython-32m.so', caseDetector).stripExtension().getPath();
     assert_1.default.equal(path2, '/blah.blah/hello.cpython-32m');
 });
 test('getWildcardRegexPattern1', () => {
-    const pattern = (0, uriUtils_1.getWildcardRegexPattern)(uri_1.Uri.parse('foo:///users/me', true), './blah/');
+    const pattern = (0, uriUtils_1.getWildcardRegexPattern)(uri_1.Uri.parse('foo:///users/me', caseDetector), './blah/');
     const regex = new RegExp(pattern);
     assert_1.default.ok(regex.test('/users/me/blah/d'));
     assert_1.default.ok(!regex.test('/users/me/blad/d'));
 });
 test('getWildcardRegexPattern2', () => {
-    const pattern = (0, uriUtils_1.getWildcardRegexPattern)(uri_1.Uri.parse('foo:///users/me', true), './**/*.py?');
+    const pattern = (0, uriUtils_1.getWildcardRegexPattern)(uri_1.Uri.parse('foo:///users/me', caseDetector), './**/*.py?');
     const regex = new RegExp(pattern);
     assert_1.default.ok(regex.test('/users/me/.blah/foo.pyd'));
     assert_1.default.ok(!regex.test('/users/me/.blah/foo.py')); // No char after
 });
 test('getWildcardRegexPattern3', () => {
-    const pattern = (0, uriUtils_1.getWildcardRegexPattern)(uri_1.Uri.parse('foo:///users/me', true), './**/.*.py');
+    const pattern = (0, uriUtils_1.getWildcardRegexPattern)(uri_1.Uri.parse('foo:///users/me', caseDetector), './**/.*.py');
     const regex = new RegExp(pattern);
     assert_1.default.ok(regex.test('/users/me/.blah/.foo.py'));
     assert_1.default.ok(!regex.test('/users/me/.blah/foo.py'));
 });
 test('getWildcardRegexPattern4', () => {
-    const pattern = (0, uriUtils_1.getWildcardRegexPattern)(uri_1.Uri.parse('//server/share/dir', true), '.');
+    const pattern = (0, uriUtils_1.getWildcardRegexPattern)(uri_1.Uri.parse('//server/share/dir', caseDetector), '.');
     const regex = new RegExp(pattern);
     assert_1.default.ok(regex.test('//server/share/dir/foo.py'));
     assert_1.default.ok(!regex.test('//server/share/dix/foo.py'));
 });
 test('getWildcardRoot1', () => {
-    const p = (0, uriUtils_1.getWildcardRoot)(uri_1.Uri.parse('foo:/users/me', true), './blah/');
+    const p = (0, uriUtils_1.getWildcardRoot)(uri_1.Uri.parse('foo:/users/me', caseDetector), './blah/');
     assert_1.default.equal(p.toString(), 'foo:/users/me/blah');
 });
 test('getWildcardRoot2', () => {
-    const p = (0, uriUtils_1.getWildcardRoot)(uri_1.Uri.parse('foo:/users/me', true), './**/*.py?/');
+    const p = (0, uriUtils_1.getWildcardRoot)(uri_1.Uri.parse('foo:/users/me', caseDetector), './**/*.py?/');
     assert_1.default.equal(p.toString(), 'foo:/users/me');
 });
 test('getWildcardRoot with root', () => {
-    const p = (0, uriUtils_1.getWildcardRoot)(uri_1.Uri.parse('foo:/', true), '.');
+    const p = (0, uriUtils_1.getWildcardRoot)(uri_1.Uri.parse('foo:/', caseDetector), '.');
     assert_1.default.equal(p.toString(), 'foo:/');
 });
 test('getWildcardRoot with drive letter', () => {
-    const p = (0, uriUtils_1.getWildcardRoot)(uri_1.Uri.parse('file:///c:/', true), '.');
+    const p = (0, uriUtils_1.getWildcardRoot)(uri_1.Uri.parse('file:///c:/', caseDetector), '.');
     assert_1.default.equal(p.toString(), 'file:///c%3A');
 });
 function resolvePaths(uri, ...paths) {
-    return uri_1.Uri.file(uri)
+    return uriUtils_1.UriEx.file(uri)
         .resolvePaths(...paths)
         .toString();
 }
@@ -645,7 +656,7 @@ test('resolvePath2', () => {
     assert_1.default.equal(resolvePaths('/path', 'to', '..', 'from', 'file.ext/'), 'file:///path/from/file.ext');
 });
 function getHomeDirUri() {
-    return uri_1.Uri.file(os.homedir());
+    return uriUtils_1.UriEx.file(os.homedir());
 }
 test('resolvePath3 ~ escape', () => {
     assert_1.default.equal(resolvePaths((0, envVarUtils_1.expandPathVariables)('~/path', uri_1.Uri.empty(), []), 'to', '..', 'from', 'file.ext/'), `${getHomeDirUri().toString()}/path/from/file.ext`);
@@ -658,14 +669,14 @@ function combinePaths(uri, ...paths) {
 }
 test('invalid ~ without root', () => {
     const path = combinePaths('Library', 'Mobile Documents', 'com~apple~CloudDocs', 'Development', 'mysuperproject');
-    assert_1.default.equal(resolvePaths((0, envVarUtils_1.expandPathVariables)(path, uri_1.Uri.parse('foo:///src', true), [])), path);
+    assert_1.default.equal(resolvePaths((0, envVarUtils_1.expandPathVariables)(path, uri_1.Uri.parse('foo:///src', caseDetector), [])), path);
 });
 test('invalid ~ with root', () => {
     const path = combinePaths('/', 'Library', 'com~apple~CloudDocs', 'Development', 'mysuperproject');
-    assert_1.default.equal(resolvePaths((0, envVarUtils_1.expandPathVariables)(path, uri_1.Uri.parse('foo:///src', true), [])), path);
+    assert_1.default.equal(resolvePaths((0, envVarUtils_1.expandPathVariables)(path, uri_1.Uri.parse('foo:///src', caseDetector), [])), path);
 });
 function containsPath(uri, child) {
-    return uri_1.Uri.parse(child, true).isChild(uri_1.Uri.parse(uri, true));
+    return uri_1.Uri.parse(child, caseDetector).isChild(uri_1.Uri.parse(uri, caseDetector));
 }
 test('containsPath1', () => {
     assert_1.default.equal(containsPath('/a/b/c/', '/a/d/../b/c/./d'), true);
@@ -677,13 +688,13 @@ test('containsPath3', () => {
     assert_1.default.equal(containsPath('/a', '/a/B'), true);
 });
 function getAnyExtensionFromPath(uri) {
-    return uri_1.Uri.parse(uri, true).lastExtension;
+    return uri_1.Uri.parse(uri, caseDetector).lastExtension;
 }
 test('getAnyExtension1', () => {
     assert_1.default.equal(getAnyExtensionFromPath('/path/to/file.ext'), '.ext');
 });
 function getBaseFileName(uri) {
-    return uri_1.Uri.parse(uri, true).fileName;
+    return uri_1.Uri.parse(uri, caseDetector).fileName;
 }
 test('getBaseFileName1', () => {
     assert_1.default.equal(getBaseFileName('/path/to/file.ext'), 'file.ext');
@@ -695,7 +706,7 @@ test('getBaseFileName3', () => {
     assert_1.default.equal(getBaseFileName('c:/'), '');
 });
 function getUriRootLength(uri) {
-    return uri_1.Uri.file(uri).getRootPathLength();
+    return uriUtils_1.UriEx.file(uri).getRootPathLength();
 }
 test('getRootLength1', () => {
     assert_1.default.equal(getUriRootLength('a'), 1);
@@ -725,7 +736,7 @@ test('getRootLength9', () => {
     assert_1.default.equal(getUriRootLength('scheme://with/authority'), 1);
 });
 function isRootedDiskUri(uri) {
-    return (0, pathUtils_1.isRootedDiskPath)(uri_1.Uri.file(uri).getFilePath());
+    return (0, pathUtils_1.isRootedDiskPath)(uriUtils_1.UriEx.file(uri).getFilePath());
 }
 test('isRootedDiskPath1', () => {
     (0, assert_1.default)(isRootedDiskUri('C:/a/b'));
@@ -749,7 +760,7 @@ test('isDiskPathRoot4', () => {
     (0, assert_1.default)(!isRootedDiskUri('c:d'));
 });
 function getRelativePath(parent, child) {
-    return uri_1.Uri.parse(parent, true).getRelativePath(uri_1.Uri.parse(child, true));
+    return uri_1.Uri.parse(parent, caseDetector).getRelativePath(uri_1.Uri.parse(child, caseDetector));
 }
 test('getRelativePath', () => {
     assert_1.default.equal(getRelativePath('/a/b/c', '/a/b/c/d/e/f'), './d/e/f');
@@ -759,15 +770,15 @@ test('getRelativePath', () => {
 test('CaseSensitivity', () => {
     const cwd = '/';
     const fsCaseInsensitive = new vfs.TestFileSystem(/*ignoreCase*/ true, { cwd });
-    assert_1.default.equal((0, uriUtils_1.isFileSystemCaseSensitiveInternal)(fsCaseInsensitive, fsCaseInsensitive), false);
+    assert_1.default.equal(fsCaseInsensitive.isLocalFileSystemCaseSensitive(), false);
     const fsCaseSensitive = new vfs.TestFileSystem(/*ignoreCase*/ false, { cwd });
-    assert_1.default.equal((0, uriUtils_1.isFileSystemCaseSensitiveInternal)(fsCaseSensitive, fsCaseSensitive), true);
+    assert_1.default.equal(fsCaseSensitive.isLocalFileSystemCaseSensitive(), true);
 });
 test('deduplicateFolders', () => {
     const listOfFolders = [
-        ['/user', '/user/temp', '/xuser/app', '/lib/python', '/home/p/.venv/lib/site-packages'].map((p) => uri_1.Uri.file(p)),
-        ['/user', '/user/temp', '/xuser/app', '/lib/python/Python310.zip', '/home/z/.venv/lib/site-packages'].map((p) => uri_1.Uri.file(p)),
-        ['/main/python/lib/site-packages', '/home/p'].map((p) => uri_1.Uri.file(p)),
+        ['/user', '/user/temp', '/xuser/app', '/lib/python', '/home/p/.venv/lib/site-packages'].map((p) => uriUtils_1.UriEx.file(p)),
+        ['/user', '/user/temp', '/xuser/app', '/lib/python/Python310.zip', '/home/z/.venv/lib/site-packages'].map((p) => uriUtils_1.UriEx.file(p)),
+        ['/main/python/lib/site-packages', '/home/p'].map((p) => uriUtils_1.UriEx.file(p)),
     ];
     const folders = (0, uriUtils_1.deduplicateFolders)(listOfFolders).map((f) => f.getPath());
     const expected = [
@@ -781,7 +792,7 @@ test('deduplicateFolders', () => {
     assert_1.default.deepStrictEqual(folders.sort(), expected.sort());
 });
 test('convert UNC path', () => {
-    const path = uri_1.Uri.file('file:///server/c$/folder/file.py');
+    const path = uriUtils_1.UriEx.file('file:///server/c$/folder/file.py');
     // When converting UNC path, server part shouldn't be removed.
     (0, assert_1.default)(path.getPath().indexOf('server') > 0);
 });
@@ -789,9 +800,10 @@ function lowerCaseDrive(entries) {
     return entries.map((p) => (process.platform === 'win32' ? p[0].toLowerCase() + p.slice(1) : p));
 }
 test('Realcase', () => {
-    const fs = (0, realFileSystem_1.createFromRealFileSystem)();
+    const tempFile = new realFileSystem_1.RealTempFile();
+    const fs = (0, realFileSystem_1.createFromRealFileSystem)(tempFile);
     const cwd = process.cwd();
-    const dir = uri_1.Uri.file(path.join(cwd, 'src', 'tests', '..', 'tests'));
+    const dir = uri_1.Uri.file(path.join(cwd, 'src', 'tests', '..', 'tests'), tempFile);
     const dirFilePath = dir.getFilePath();
     const entries = nodefs
         .readdirSync(dirFilePath)
@@ -807,17 +819,18 @@ test('Realcase', () => {
     // If windows, check that the case is correct.
     if (process.platform === 'win32') {
         for (const p of fspaths) {
-            const upper = uri_1.Uri.file(p.toString().toUpperCase());
+            const upper = uriUtils_1.UriEx.file(p.toString().toUpperCase());
             const real = fs.realCasePath(upper);
             assert_1.default.strictEqual(p, real.getFilePath());
         }
     }
 });
 test('Realcase use cwd implicitly', () => {
-    const fs = (0, realFileSystem_1.createFromRealFileSystem)();
+    const tempFile = new realFileSystem_1.RealTempFile();
+    const fs = (0, realFileSystem_1.createFromRealFileSystem)(tempFile);
     const cwd = process.cwd();
     const dir = path.join(cwd, 'src', 'tests');
-    const uri = uri_1.Uri.file(dir);
+    const uri = uri_1.Uri.file(dir, tempFile);
     const entries = nodefs.readdirSync(dir).map((entry) => path.basename(nodefs.realpathSync(path.join(dir, entry))));
     const fsentries = fs.readdirSync(uri);
     const paths = entries.map((entry) => nodefs.realpathSync(path.join(dir, entry)));
@@ -825,10 +838,18 @@ test('Realcase use cwd implicitly', () => {
     assert_1.default.deepStrictEqual(lowerCaseDrive(paths), fspaths);
 });
 test('Web URIs dont exist', () => {
-    const fs = (0, realFileSystem_1.createFromRealFileSystem)();
-    const uri = uri_1.Uri.parse('http://www.bing.com', /*ignoreCase*/ true);
+    const tempFile = new realFileSystem_1.RealTempFile();
+    const fs = (0, realFileSystem_1.createFromRealFileSystem)(tempFile);
+    const uri = uriUtils_1.UriEx.parse('http://www.bing.com');
     (0, assert_1.default)(!fs.existsSync(uri));
     const stat = fs.statSync(uri);
     (0, assert_1.default)(!stat.isFile());
 });
+test('constant uri test', () => {
+    const name = 'constant uri';
+    const uri1 = uri_1.Uri.constant(name);
+    const uri2 = uri_1.Uri.constant(name);
+    (0, assert_1.default)(!uri1.equals(uri2));
+    (0, assert_1.default)(uri1.equals(uri1));
+});
 //# sourceMappingURL=uri.test.js.map