ckaczor/azuredatastudio
1
0
Fork 0
mirror of https://github.com/ckaczor/azuredatastudio.git synced 2026-02-11 10:38:31 -05:00
Code Issues Packages Projects Releases Wiki Activity

Merge from vscode 64980ea1f3f532c82bb6c28d27bba9ef2c5b4463 (#7206)

Browse Source 
* Merge from vscode 64980ea1f3f532c82bb6c28d27bba9ef2c5b4463

* fix config changes

* fix strictnull checks
This commit is contained in:
Anthony Dresser
2019-09-15 22:38:26 -07:00
committed by GitHub
parent fa6c52699e
commit ea0f9e6ce9
1226 changed files with 21541 additions and 17633 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/vs/platform/files/common/fileService.ts
View File

@@ -7,7 +7,6 @@ import { Disposable, IDisposable, toDisposable, dispose, DisposableStore } from
import { IFileService, IResolveFileOptions, FileChangesEvent, FileOperationEvent, IFileSystemProviderRegistrationEvent, IFileSystemProvider, IFileStat, IResolveFileResult, ICreateFileOptions, IFileSystemProviderActivationEvent, FileOperationError, FileOperationResult, FileOperation, FileSystemProviderCapabilities, FileType, toFileSystemProviderErrorCode, FileSystemProviderErrorCode, IStat, IFileStatWithMetadata, IResolveMetadataFileOptions, etag, hasReadWriteCapability, hasFileFolderCopyCapability, hasOpenReadWriteCloseCapability, toFileOperationResult, IFileSystemProviderWithOpenReadWriteCloseCapability, IFileSystemProviderWithFileReadWriteCapability, IResolveFileResultWithMetadata, IWatchOptions, IWriteFileOptions, IReadFileOptions, IFileStreamContent, IFileContent, ETAG_DISABLED } from 'vs/platform/files/common/files';
import { URI } from 'vs/base/common/uri';
import { Event, Emitter } from 'vs/base/common/event';
import { ServiceIdentifier } from 'vs/platform/instantiation/common/instantiation';
import { isAbsolutePath, dirname, basename, joinPath, isEqual, isEqualOrParent } from 'vs/base/common/resources';
import { localize } from 'vs/nls';
import { TernarySearchTree } from 'vs/base/common/map';
@@ -21,7 +20,7 @@ import { Schemas } from 'vs/base/common/network';
export class FileService extends Disposable implements IFileService {
_serviceBrand!: ServiceIdentifier<any>;
_serviceBrand: undefined;
private readonly BUFFER_SIZE = 64 * 1024;

4
src/vs/platform/files/common/files.ts
View File

@@ -6,7 +6,7 @@
import { sep } from 'vs/base/common/path';
import { URI } from 'vs/base/common/uri';
import * as glob from 'vs/base/common/glob';
import { createDecorator, ServiceIdentifier } from 'vs/platform/instantiation/common/instantiation';
import { createDecorator } from 'vs/platform/instantiation/common/instantiation';
import { Event } from 'vs/base/common/event';
import { startsWithIgnoreCase } from 'vs/base/common/strings';
import { IDisposable } from 'vs/base/common/lifecycle';
@@ -18,7 +18,7 @@ export const IFileService = createDecorator<IFileService>('fileService');
export interface IFileService {
_serviceBrand: ServiceIdentifier<any>;
_serviceBrand: undefined;
/**
* An event that is fired when a file system provider is added or removed

2
src/vs/platform/files/node/diskFileSystemProvider.ts
View File

@@ -38,7 +38,7 @@ export class DiskFileSystemProvider extends Disposable implements IFileSystemPro
onDidChangeCapabilities: Event<void> = Event.None;
protected _capabilities: FileSystemProviderCapabilities;
protected _capabilities: FileSystemProviderCapabilities | undefined;
get capabilities(): FileSystemProviderCapabilities {
if (!this._capabilities) {
this._capabilities =

4
src/vs/platform/files/node/watcher/nodejs/watcherService.ts
View File

@@ -13,7 +13,7 @@ import { ThrottledDelayer } from 'vs/base/common/async';
import { join, basename } from 'vs/base/common/path';
export class FileWatcher extends Disposable {
private isDisposed: boolean;
private isDisposed: boolean | undefined;
private fileChangesDelayer: ThrottledDelayer<void> = this._register(new ThrottledDelayer<void>(CHANGE_BUFFER_DELAY * 2 /* sync on delay from underlying library */));
private fileChangesBuffer: IDiskFileChange[] = [];
@@ -125,4 +125,4 @@ export class FileWatcher extends Disposable {
super.dispose();
}
}
}

4
src/vs/platform/files/node/watcher/nsfw/nsfwWatcherService.ts
View File

@@ -36,8 +36,8 @@ export class NsfwWatcherService implements IWatcherService {
private static readonly FS_EVENT_DELAY = 50; // aggregate and only emit events when changes have stopped for this duration (in ms)
private _pathWatchers: { [watchPath: string]: IPathWatcher } = {};
private _verboseLogging: boolean;
private enospcErrorLogged: boolean;
private _verboseLogging: boolean | undefined;
private enospcErrorLogged: boolean | undefined;
private _onWatchEvent = new Emitter<IDiskFileChange[]>();
readonly onWatchEvent = this._onWatchEvent.event;

9
src/vs/platform/files/node/watcher/nsfw/watcherService.ts
View File

@@ -12,9 +12,10 @@ import { IWatcherRequest } from 'vs/platform/files/node/watcher/nsfw/watcher';
import { getPathFromAmdModule } from 'vs/base/common/amd';
export class FileWatcher extends Disposable {
private static readonly MAX_RESTARTS = 5;
private service: WatcherChannelClient;
private service: WatcherChannelClient | undefined;
private isDisposed: boolean;
private restartCounter: number;
@@ -77,7 +78,7 @@ export class FileWatcher extends Disposable {
setVerboseLogging(verboseLogging: boolean): void {
this.verboseLogging = verboseLogging;
if (!this.isDisposed) {
if (!this.isDisposed && this.service) {
this.service.setVerboseLogging(verboseLogging);
}
}
@@ -89,7 +90,9 @@ export class FileWatcher extends Disposable {
setFolders(folders: IWatcherRequest[]): void {
this.folders = folders;
this.service.setRoots(folders);
if (this.service) {
this.service.setRoots(folders);
}
}
dispose(): void {

10
src/vs/platform/files/node/watcher/unix/chokidarWatcherService.ts
View File

@@ -37,11 +37,11 @@ export class ChokidarWatcherService implements IWatcherService {
private _pollingInterval?: number;
private _usePolling?: boolean;
private _verboseLogging: boolean;
private _verboseLogging: boolean | undefined;
private spamCheckStartTime: number;
private spamWarningLogged: boolean;
private enospcErrorLogged: boolean;
private spamCheckStartTime: number | undefined;
private spamWarningLogged: boolean | undefined;
private enospcErrorLogged: boolean | undefined;
private _onWatchEvent = new Emitter<IDiskFileChange[]>();
readonly onWatchEvent = this._onWatchEvent.event;
@@ -231,7 +231,7 @@ export class ChokidarWatcherService implements IWatcherService {
if (undeliveredFileEvents.length === 0) {
this.spamWarningLogged = false;
this.spamCheckStartTime = now;
} else if (!this.spamWarningLogged && this.spamCheckStartTime + ChokidarWatcherService.EVENT_SPAM_WARNING_THRESHOLD < now) {
} else if (!this.spamWarningLogged && typeof this.spamCheckStartTime === 'number' && this.spamCheckStartTime + ChokidarWatcherService.EVENT_SPAM_WARNING_THRESHOLD < now) {
this.spamWarningLogged = true;
this.warn(`Watcher is busy catching up with ${undeliveredFileEvents.length} file changes in 60 seconds. Latest changed path is "${event.path}"`);
}

11
src/vs/platform/files/node/watcher/unix/watcherService.ts
View File

@@ -16,7 +16,7 @@ export class FileWatcher extends Disposable {
private isDisposed: boolean;
private restartCounter: number;
private service: WatcherChannelClient;
private service: WatcherChannelClient | undefined;
constructor(
private folders: IWatcherRequest[],
@@ -81,13 +81,18 @@ export class FileWatcher extends Disposable {
setVerboseLogging(verboseLogging: boolean): void {
this.verboseLogging = verboseLogging;
this.service.setVerboseLogging(verboseLogging);
if (this.service) {
this.service.setVerboseLogging(verboseLogging);
}
}
setFolders(folders: IWatcherRequest[]): void {
this.folders = folders;
this.service.setRoots(folders);
if (this.service) {
this.service.setRoots(folders);
}
}
dispose(): void {