Skip to content

Commit 5ebd625

Browse files
sbattenbpasero
sbatten
authored and
bpasero
committed
use new path implementation (microsoft#68538)
* adopt paths.node over path * fix strict null * remove hacky typing inlabel.test.ts
1 parent 92b16d8 commit 5ebd625

85 files changed

Lines changed: 215 additions & 221 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎src/tsconfig.strictNullChecks.json‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -382,7 +382,6 @@
382382
"./vs/platform/workspace/test/common/workspace.test.ts",
383383
"./vs/platform/workspaces/common/workspaces.ts",
384384
"./vs/platform/workspaces/electron-main/workspacesMainService.ts",
385-
"./vs/platform/workspaces/node/workspaces.ts",
386385
"./vs/platform/workspaces/node/workspacesIpc.ts",
387386
"./vs/vscode.d.ts",
388387
"./vs/vscode.proposed.d.ts",
@@ -496,12 +495,12 @@
496495
"./vs/workbench/common/views.ts",
497496
"./vs/workbench/contrib/backup/common/backupRestorer.ts",
498497
"./vs/workbench/contrib/cli/electron-browser/cli.contribution.ts",
498+
"./vs/workbench/contrib/codeEditor/browser/largeFileOptimizations.ts",
499499
"./vs/workbench/contrib/codeEditor/browser/menuPreventer.ts",
500500
"./vs/workbench/contrib/codeEditor/browser/simpleEditorOptions.ts",
501501
"./vs/workbench/contrib/codeEditor/electron-browser/accessibility.ts",
502502
"./vs/workbench/contrib/codeEditor/electron-browser/inspectKeybindings.ts",
503503
"./vs/workbench/contrib/codeEditor/electron-browser/languageConfiguration/languageConfigurationExtensionPoint.ts",
504-
"./vs/workbench/contrib/codeEditor/electron-browser/largeFileOptimizations.ts",
505504
"./vs/workbench/contrib/codeEditor/electron-browser/selectionClipboard.ts",
506505
"./vs/workbench/contrib/codeEditor/electron-browser/simpleEditorOptions.ts",
507506
"./vs/workbench/contrib/codeEditor/electron-browser/sleepResumeRepaintMinimap.ts",

‎src/vs/base/common/paths.node.ts‎

Lines changed: 11 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -178,6 +178,14 @@ function _format(sep, pathObject) {
178178
return dir + sep + base;
179179
}
180180

181+
interface ParsedPath {
182+
root: string;
183+
dir: string;
184+
base: string;
185+
ext: string;
186+
name: string;
187+
}
188+
181189
interface IPath {
182190
normalize(path: string): string;
183191
isAbsolute(path: string): boolean;
@@ -188,9 +196,9 @@ interface IPath {
188196
basename(path: string, ext?: string): string;
189197
extname(path: string): string;
190198
format(pathObject): string;
191-
parse(path: string): object;
199+
parse(path: string): ParsedPath;
192200
toNamespacedPath(path: string): string;
193-
sep: string;
201+
sep: '\\' | '/';
194202
delimiter: string;
195203
win32: IPath | null;
196204
posix: IPath | null;
@@ -1572,7 +1580,7 @@ const posix: IPath = {
15721580
return _format('/', pathObject);
15731581
},
15741582

1575-
parse(path: string): object {
1583+
parse(path: string): ParsedPath {
15761584
validateString(path, 'path');
15771585

15781586
let ret = { root: '', dir: '', base: '', ext: '', name: '' };

‎src/vs/base/node/config.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
*--------------------------------------------------------------------------------------------*/
55

66
import * as fs from 'fs';
7-
import { dirname, basename } from 'path';
7+
import { dirname, basename } from 'vs/base/common/paths.node';
88
import * as objects from 'vs/base/common/objects';
99
import { IDisposable, dispose } from 'vs/base/common/lifecycle';
1010
import { Event, Emitter } from 'vs/base/common/event';

‎src/vs/base/node/extfs.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
*--------------------------------------------------------------------------------------------*/
55

66
import * as fs from 'fs';
7-
import * as paths from 'path';
7+
import * as paths from 'vs/base/common/paths.node';
88
import { nfcall } from 'vs/base/common/async';
99
import { normalizeNFC } from 'vs/base/common/normalization';
1010
import * as platform from 'vs/base/common/platform';

‎src/vs/base/node/pfs.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
*--------------------------------------------------------------------------------------------*/
55

66
import * as extfs from 'vs/base/node/extfs';
7-
import { join } from 'path';
7+
import { join } from 'vs/base/common/paths.node';
88
import { nfcall, Queue } from 'vs/base/common/async';
99
import * as fs from 'fs';
1010
import * as os from 'os';

‎src/vs/base/node/processes.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
* Licensed under the MIT License. See License.txt in the project root for license information.
44
*--------------------------------------------------------------------------------------------*/
55

6-
import * as path from 'path';
6+
import * as path from 'vs/base/common/paths.node';
77
import * as fs from 'fs';
88
import * as cp from 'child_process';
99
import * as nls from 'vs/nls';

‎src/vs/base/node/stats.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
*--------------------------------------------------------------------------------------------*/
55

66
import { readdir, stat, exists, readFile } from 'fs';
7-
import { join } from 'path';
7+
import { join } from 'vs/base/common/paths.node';
88
import { parse, ParseError } from 'vs/base/common/json';
99

1010
export interface WorkspaceStatItem {

‎src/vs/base/node/storage.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ import { Emitter, Event } from 'vs/base/common/event';
99
import { ThrottledDelayer, timeout } from 'vs/base/common/async';
1010
import { isUndefinedOrNull } from 'vs/base/common/types';
1111
import { mapToString, setToString } from 'vs/base/common/map';
12-
import { basename } from 'path';
12+
import { basename } from 'vs/base/common/paths.node';
1313
import { copy, renameIgnoreError, unlink } from 'vs/base/node/pfs';
1414
import { fill } from 'vs/base/common/arrays';
1515

‎src/vs/base/parts/ipc/node/ipc.net.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
import { Socket, Server as NetServer, createConnection, createServer } from 'net';
77
import { Event, Emitter } from 'vs/base/common/event';
88
import { IMessagePassingProtocol, ClientConnectionEvent, IPCServer, IPCClient } from 'vs/base/parts/ipc/node/ipc';
9-
import { join } from 'path';
9+
import { join } from 'vs/base/common/paths.node';
1010
import { tmpdir } from 'os';
1111
import { generateUuid } from 'vs/base/common/uuid';
1212
import { IDisposable } from 'vs/base/common/lifecycle';

‎src/vs/code/electron-browser/sharedProcess/contrib/languagePackCachedDataCleaner.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
* Licensed under the MIT License. See License.txt in the project root for license information.
44
*--------------------------------------------------------------------------------------------*/
55

6-
import * as path from 'path';
6+
import * as path from 'vs/base/common/paths.node';
77
import * as pfs from 'vs/base/node/pfs';
88

99
import { IStringDictionary } from 'vs/base/common/collections';

0 commit comments

Comments
 (0)