Skip to content

Commit 0df6764

Browse files
sandy081sandy081
committed
move file service to platform
1 parent 39d50ea commit 0df6764

62 files changed

Lines changed: 100 additions & 90 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.

‎build/gulpfile.vscode.js‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -77,8 +77,8 @@ const vscodeResources = [
7777
'out-build/vs/**/markdown.css',
7878
'out-build/vs/workbench/contrib/tasks/**/*.json',
7979
'out-build/vs/workbench/contrib/welcome/walkThrough/**/*.md',
80-
'out-build/vs/workbench/services/files/**/*.exe',
81-
'out-build/vs/workbench/services/files/**/*.md',
80+
'out-build/vs/platform/files/**/*.exe',
81+
'out-build/vs/platform/files/**/*.md',
8282
'out-build/vs/code/electron-browser/workbench/**',
8383
'out-build/vs/code/electron-browser/sharedProcess/sharedProcess.js',
8484
'out-build/vs/code/electron-browser/issue/issueReporter.js',

‎build/lib/test/i18n.test.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ suite('XLF Parser Tests', () => {
3939
base = { name: 'vs/base', project: editorProject },
4040
code = { name: 'vs/code', project: workbenchProject },
4141
workbenchParts = { name: 'vs/workbench/contrib/html', project: workbenchProject },
42-
workbenchServices = { name: 'vs/workbench/services/files', project: workbenchProject },
42+
workbenchServices = { name: 'vs/workbench/services/textfile', project: workbenchProject },
4343
workbench = { name: 'vs/workbench', project: workbenchProject};
4444

4545
assert.deepEqual(i18n.getResource('vs/platform/actions/browser/menusExtensionPoint'), platform);
@@ -48,7 +48,7 @@ suite('XLF Parser Tests', () => {
4848
assert.deepEqual(i18n.getResource('vs/base/common/errorMessage'), base);
4949
assert.deepEqual(i18n.getResource('vs/code/electron-main/window'), code);
5050
assert.deepEqual(i18n.getResource('vs/workbench/contrib/html/browser/webview'), workbenchParts);
51-
assert.deepEqual(i18n.getResource('vs/workbench/services/files/node/fileService'), workbenchServices);
51+
assert.deepEqual(i18n.getResource('vs/workbench/services/textfile/node/testFileService'), workbenchServices);
5252
assert.deepEqual(i18n.getResource('vs/workbench/browser/parts/panel/panelActions'), workbench);
5353
});
5454
});

src/vs/workbench/services/files/common/fileService.ts renamed to src/vs/platform/files/common/fileService.ts

File renamed without changes.

src/vs/workbench/services/files/electron-browser/diskFileSystemProvider.ts renamed to src/vs/platform/files/electron-browser/diskFileSystemProvider.ts

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

66
import { shell } from 'electron';
7-
import { DiskFileSystemProvider as NodeDiskFileSystemProvider } from 'vs/workbench/services/files/node/diskFileSystemProvider';
7+
import { DiskFileSystemProvider as NodeDiskFileSystemProvider } from 'vs/platform/files/node/diskFileSystemProvider';
88
import { FileDeleteOptions, FileSystemProviderCapabilities } from 'vs/platform/files/common/files';
99
import { isWindows } from 'vs/base/common/platform';
1010
import { localize } from 'vs/nls';

src/vs/workbench/services/files/node/diskFileSystemProvider.ts renamed to src/vs/platform/files/node/diskFileSystemProvider.ts

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -17,11 +17,11 @@ import { isEqual } from 'vs/base/common/extpath';
1717
import { retry, ThrottledDelayer } from 'vs/base/common/async';
1818
import { ILogService, LogLevel } from 'vs/platform/log/common/log';
1919
import { localize } from 'vs/nls';
20-
import { IDiskFileChange, toFileChanges, ILogMessage } from 'vs/workbench/services/files/node/watcher/watcher';
21-
import { FileWatcher as UnixWatcherService } from 'vs/workbench/services/files/node/watcher/unix/watcherService';
22-
import { FileWatcher as WindowsWatcherService } from 'vs/workbench/services/files/node/watcher/win32/watcherService';
23-
import { FileWatcher as NsfwWatcherService } from 'vs/workbench/services/files/node/watcher/nsfw/watcherService';
24-
import { FileWatcher as NodeJSWatcherService } from 'vs/workbench/services/files/node/watcher/nodejs/watcherService';
20+
import { IDiskFileChange, toFileChanges, ILogMessage } from 'vs/platform/files/node/watcher/watcher';
21+
import { FileWatcher as UnixWatcherService } from 'vs/platform/files/node/watcher/unix/watcherService';
22+
import { FileWatcher as WindowsWatcherService } from 'vs/platform/files/node/watcher/win32/watcherService';
23+
import { FileWatcher as NsfwWatcherService } from 'vs/platform/files/node/watcher/nsfw/watcherService';
24+
import { FileWatcher as NodeJSWatcherService } from 'vs/platform/files/node/watcher/nodejs/watcherService';
2525

2626
export interface IWatcherOptions {
2727
pollingInterval?: number;

src/vs/workbench/services/files/node/watcher/nodejs/watcherService.ts renamed to src/vs/platform/files/node/watcher/nodejs/watcherService.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 { IDiskFileChange, normalizeFileChanges, ILogMessage } from 'vs/workbench/services/files/node/watcher/watcher';
6+
import { IDiskFileChange, normalizeFileChanges, ILogMessage } from 'vs/platform/files/node/watcher/watcher';
77
import { Disposable } from 'vs/base/common/lifecycle';
88
import { statLink } from 'vs/base/node/pfs';
99
import { realpath } from 'vs/base/node/extpath';

src/vs/workbench/services/files/node/watcher/nsfw/nsfwWatcherService.ts renamed to src/vs/platform/files/node/watcher/nsfw/nsfwWatcherService.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,9 @@ import * as glob from 'vs/base/common/glob';
77
import * as extpath from 'vs/base/common/extpath';
88
import * as path from 'vs/base/common/path';
99
import * as platform from 'vs/base/common/platform';
10-
import { IDiskFileChange, normalizeFileChanges, ILogMessage } from 'vs/workbench/services/files/node/watcher/watcher';
10+
import { IDiskFileChange, normalizeFileChanges, ILogMessage } from 'vs/platform/files/node/watcher/watcher';
1111
import * as nsfw from 'nsfw';
12-
import { IWatcherService, IWatcherRequest, IWatcherOptions } from 'vs/workbench/services/files/node/watcher/nsfw/watcher';
12+
import { IWatcherService, IWatcherRequest, IWatcherOptions } from 'vs/platform/files/node/watcher/nsfw/watcher';
1313
import { ThrottledDelayer } from 'vs/base/common/async';
1414
import { FileChangeType } from 'vs/platform/files/common/files';
1515
import { normalizeNFC } from 'vs/base/common/normalization';

src/vs/workbench/services/files/node/watcher/nsfw/test/nsfwWatcherService.test.ts renamed to src/vs/platform/files/node/watcher/nsfw/test/nsfwWatcherService.test.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@
66
import * as assert from 'assert';
77
import * as platform from 'vs/base/common/platform';
88

9-
import { NsfwWatcherService } from 'vs/workbench/services/files/node/watcher/nsfw/nsfwWatcherService';
10-
import { IWatcherRequest } from 'vs/workbench/services/files/node/watcher/nsfw/watcher';
9+
import { NsfwWatcherService } from 'vs/platform/files/node/watcher/nsfw/nsfwWatcherService';
10+
import { IWatcherRequest } from 'vs/platform/files/node/watcher/nsfw/watcher';
1111

1212
class TestNsfwWatcherService extends NsfwWatcherService {
1313
public normalizeRoots(roots: string[]): string[] {

src/vs/workbench/services/files/node/watcher/nsfw/watcher.ts renamed to src/vs/platform/files/node/watcher/nsfw/watcher.ts

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

66
import { Event } from 'vs/base/common/event';
7-
import { IDiskFileChange, ILogMessage } from 'vs/workbench/services/files/node/watcher/watcher';
7+
import { IDiskFileChange, ILogMessage } from 'vs/platform/files/node/watcher/watcher';
88

99
export interface IWatcherRequest {
1010
path: string;

src/vs/workbench/services/files/node/watcher/nsfw/watcherApp.ts renamed to src/vs/platform/files/node/watcher/nsfw/watcherApp.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@
44
*--------------------------------------------------------------------------------------------*/
55

66
import { Server } from 'vs/base/parts/ipc/node/ipc.cp';
7-
import { WatcherChannel } from 'vs/workbench/services/files/node/watcher/nsfw/watcherIpc';
8-
import { NsfwWatcherService } from 'vs/workbench/services/files/node/watcher/nsfw/nsfwWatcherService';
7+
import { WatcherChannel } from 'vs/platform/files/node/watcher/nsfw/watcherIpc';
8+
import { NsfwWatcherService } from 'vs/platform/files/node/watcher/nsfw/nsfwWatcherService';
99

1010
const server = new Server('watcher');
1111
const service = new NsfwWatcherService();

0 commit comments

Comments
 (0)