Merge from vscode 64980ea1f3f532c82bb6c28d27bba9ef2c5b4463 (#7206)

* 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

View File

@@ -10,7 +10,6 @@ import { createDecorator } from 'vs/platform/instantiation/common/instantiation'
import { Event } from 'vs/base/common/event';
import { IDisposable } from 'vs/base/common/lifecycle';
import { Command } from 'vs/editor/common/modes';
import { ColorIdentifier } from 'vs/platform/theme/common/colorRegistry';
import { ISequence } from 'vs/base/common/sequence';
export const VIEWLET_ID = 'workbench.view.scm';
@@ -28,10 +27,6 @@ export interface ISCMResourceDecorations {
tooltip?: string;
strikeThrough?: boolean;
faded?: boolean;
source?: string;
letter?: string;
color?: ColorIdentifier;
}
export interface ISCMResource {
@@ -112,7 +107,7 @@ export interface ISCMRepository extends IDisposable {
export interface ISCMService {
readonly _serviceBrand: any;
readonly _serviceBrand: undefined;
readonly onDidAddRepository: Event<ISCMRepository>;
readonly onDidRemoveRepository: Event<ISCMRepository>;

View File

@@ -105,7 +105,7 @@ class SCMRepository implements ISCMRepository {
export class SCMService implements ISCMService {
_serviceBrand: any;
_serviceBrand: undefined;
private _providerIds = new Set<string>();
private _repositories: ISCMRepository[] = [];