maxmustermann/vscode
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Fix build hygiene issues

Browse source
This commit is contained in:
Alex Dima 2017-04-14 14:08:52 +03:00
parent 562f28f4f5
commit aca01f2daa
53 changed files with 89 additions and 89 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
extensions/extension-editing/src/extension.ts
View file

@ -23,7 +23,7 @@ const _linkProvider = new class implements vscode.DocumentLinkProvider {
private _linkPattern = /[^!]\[.*?\]\(#(.*?)\)/g;
provideDocumentLinks(document: vscode.TextDocument, token: vscode.CancellationToken): vscode.DocumentLink[] {
const {version} = document;
const { version } = document;
if (!this._cachedResult || this._cachedResult.version !== version) {
const links = this._computeDocumentLinks(document);
this._cachedResult = { version, links };

2
extensions/git/src/askpass.ts
View file

@ -30,7 +30,7 @@ export class Askpass implements Disposable {
req.setEncoding('utf8');
req.on('data', (d: string) => chunks.push(d));
req.on('end', () => {
const {request, host} = JSON.parse(chunks.join(''));
const { request, host } = JSON.parse(chunks.join(''));
this.prompt(host, request).then(result => {
res.writeHead(200);

2
extensions/json/server/src/utils/uri.ts
View file

@ -274,7 +274,7 @@ export default class URI {
const parts: string[] = [];
let {scheme, authority, path, query, fragment} = uri;
let { scheme, authority, path, query, fragment } = uri;
if (scheme) {
parts.push(scheme, ':');
}

2
extensions/markdown/src/markdownEngine.ts
View file

@ -106,7 +106,7 @@ export class MarkdownEngine {
}
public parse(document: vscode.Uri, source: string): IToken[] {
const {text, offset} = this.stripFrontmatter(source);
const { text, offset } = this.stripFrontmatter(source);
this.currentDocument = document;
return this.engine.parse(text, {}).map(token => {
if (token.map) {

4
extensions/typescript/src/utils/projectStatus.ts
View file

@ -114,7 +114,7 @@ function createLargeProjectMonitorForProject(item: ExcludeHintItem, client: ITyp
if (!res.body) {
return;
}
let {configFileName, fileNames} = res.body;
let { configFileName, fileNames } = res.body;
if (projectHinted[configFileName] === true || !fileNames) {
return;
@ -159,7 +159,7 @@ export function create(client: ITypescriptServiceClient, isOpen: (path: string)
let item = new ExcludeHintItem(client);
toDispose.push(vscode.commands.registerCommand('js.projectStatus.command', () => {
let {message, options} = item.getCurrentHint();
let { message, options } = item.getCurrentHint();
return vscode.window.showInformationMessage(message, ...options).then(selection => {
if (selection) {
return selection.execute();

4
src/vs/base/browser/htmlContentRenderer.ts
View file

@ -44,7 +44,7 @@ export function renderHtml(content: RenderableContent, options: RenderOptions =
function _renderHtml(content: IHTMLContentElement, options: RenderOptions = {}): Node {
let {codeBlockRenderer, actionCallback} = options;
let { codeBlockRenderer, actionCallback } = options;
if (content.isText) {
return document.createTextNode(content.text);
@ -80,7 +80,7 @@ function _renderHtml(content: IHTMLContentElement, options: RenderOptions = {}):
// this is sort of legacy given that we have full
// support for markdown. Turn this into markdown
// and continue
let {language, value} = content.code;
let { language, value } = content.code;
content.markdown = '```' + language + '\n' + value + '\n```';
}
if (content.markdown) {

2
src/vs/base/browser/ui/list/rowCache.ts
View file

@ -58,7 +58,7 @@ export class RowCache<T> implements IDisposable {
}
private releaseRow(row: IRow): void {
const {domNode, templateId} = row;
const { domNode, templateId } = row;
removeClass(domNode, 'scrolling');
removeFromParent(domNode);

2
src/vs/base/common/errors.ts
View file

@ -103,7 +103,7 @@ export function onUnexpectedPromiseError<T>(promise: TPromise<T>): TPromise<T> {
export function transformErrorForSerialization(error: any): any {
if (error instanceof Error) {
let {name, message} = error;
let { name, message } = error;
let stack: string = (<any>error).stacktrace || (<any>error).stack;
return {
$isError: true,

2
src/vs/base/node/id.ts
View file

@ -47,7 +47,7 @@ export const virtualMachineHint: { value(): number } = new class {
const interfaces = networkInterfaces();
for (let name in interfaces) {
if (Object.prototype.hasOwnProperty.call(interfaces, name)) {
for (const {mac, internal} of interfaces[name]) {
for (const { mac, internal } of interfaces[name]) {
if (!internal) {
interfaceCount += 1;
if (this._isVirtualMachineMacAdress(mac.toUpperCase())) {

8
src/vs/base/test/node/stream/stream.test.ts
View file

@ -14,7 +14,7 @@ suite('Stream', () => {
test('readExactlyByFile - ANSI', function (done: (err?) => void) {
const file = require.toUrl('./fixtures/file.css');
stream.readExactlyByFile(file, 10).then(({buffer, bytesRead}) => {
stream.readExactlyByFile(file, 10).then(({ buffer, bytesRead }) => {
assert.equal(bytesRead, 10);
assert.equal(buffer.toString(), '/*--------');
done();
@ -24,7 +24,7 @@ suite('Stream', () => {
test('readExactlyByFile - empty', function (done: (err?: any) => void) {
const file = require.toUrl('./fixtures/empty.txt');
stream.readExactlyByFile(file, 10).then(({bytesRead}) => {
stream.readExactlyByFile(file, 10).then(({ bytesRead }) => {
assert.equal(bytesRead, 0);
done();
}, done);
@ -33,7 +33,7 @@ suite('Stream', () => {
test('readExactlyByStream - ANSI', function (done: (err?: any) => void) {
const file = require.toUrl('./fixtures/file.css');
stream.readExactlyByStream(fs.createReadStream(file), 10).then(({buffer, bytesRead}) => {
stream.readExactlyByStream(fs.createReadStream(file), 10).then(({ buffer, bytesRead }) => {
assert.equal(bytesRead, 10);
assert.equal(buffer.toString(), '/*--------');
done();
@ -43,7 +43,7 @@ suite('Stream', () => {
test('readExactlyByStream - empty', function (done: (err?: any) => void) {
const file = require.toUrl('./fixtures/empty.txt');
stream.readExactlyByStream(fs.createReadStream(file), 10).then(({bytesRead}) => {
stream.readExactlyByStream(fs.createReadStream(file), 10).then(({ bytesRead }) => {
assert.equal(bytesRead, 0);
done();
}, done);

2
src/vs/code/electron-main/menus.ts
View file

@ -489,7 +489,7 @@ export class VSCodeMenu {
private setOpenRecentMenu(openRecentMenu: Electron.Menu): void {
openRecentMenu.append(this.createMenuItem(nls.localize({ key: 'miReopenClosedEditor', comment: ['&& denotes a mnemonic'] }, "&&Reopen Closed Editor"), 'workbench.action.reopenClosedEditor'));
const {folders, files} = this.windowsService.getRecentPathsList();
const { folders, files } = this.windowsService.getRecentPathsList();
// Folders
if (folders.length > 0) {

2
src/vs/editor/common/editorCommonExtensions.ts
View file

@ -137,7 +137,7 @@ export module CommonEditorRegistry {
export function registerDefaultLanguageCommand(id: string, handler: (model: editorCommon.IModel, position: Position, args: { [n: string]: any }) => any) {
registerLanguageCommand(id, function (accessor, args) {
const {resource, position} = args;
const { resource, position } = args;
if (!(resource instanceof URI)) {
throw illegalArgument('resource');
}

2
src/vs/editor/common/services/modelServiceImpl.ts
View file

@ -135,7 +135,7 @@ class ModelMarkerHandler {
}
let hoverMessage: MarkedString[] = null;
let {message, source} = marker;
let { message, source } = marker;
if (typeof message === 'string') {
message = message.trim();

2
src/vs/editor/contrib/codelens/common/codelens.ts
View file

@ -56,7 +56,7 @@ export function getCodeLensData(model: IModel): TPromise<ICodeLensData[]> {
CommonEditorRegistry.registerLanguageCommand('_executeCodeLensProvider', function (accessor, args) {
const {resource} = args;
const { resource } = args;
if (!(resource instanceof URI)) {
throw illegalArgument();
}

2
src/vs/editor/contrib/links/browser/links.ts
View file

@ -260,7 +260,7 @@ class LinkDetector implements editorCommon.IEditorContribution {
return;
}
const {link} = occurence;
const { link } = occurence;
link.resolve().then(uri => {
// open the uri

2
src/vs/editor/contrib/quickOpen/common/quickOpen.ts
View file

@ -64,7 +64,7 @@ function flatten(bucket: SymbolInformation[], entries: SymbolInformation[], over
CommonEditorRegistry.registerLanguageCommand('_executeDocumentSymbolProvider', function (accessor, args) {
const {resource} = args;
const { resource } = args;
if (!(resource instanceof URI)) {
throw illegalArgument('resource');
}

6
src/vs/editor/contrib/referenceSearch/browser/referencesController.ts
View file

@ -118,7 +118,7 @@ export class ReferencesController implements editorCommon.IEditorContribution {
}));
this._disposables.push(this._widget.onDidSelectReference(event => {
let {element, kind} = event;
let { element, kind } = event;
switch (kind) {
case 'open':
if (event.source === 'editor'
@ -214,7 +214,7 @@ export class ReferencesController implements editorCommon.IEditorContribution {
this._widget.hide();
this._ignoreModelChangeEvent = true;
const {uri, range} = ref;
const { uri, range } = ref;
this._editorService.openEditor({
resource: uri,
@ -244,7 +244,7 @@ export class ReferencesController implements editorCommon.IEditorContribution {
}
private _openReference(ref: OneReference, sideBySide: boolean): void {
const {uri, range} = ref;
const { uri, range } = ref;
this._editorService.openEditor({
resource: uri,
options: { selection: range }

2
src/vs/editor/contrib/snippet/common/snippet.ts
View file

@ -120,7 +120,7 @@ export class CodeSnippet implements ICodeSnippet {
for (const originalPlaceHolder of this.placeHolders) {
let resultOccurences = [];
for (let {startLineNumber, startColumn, endLineNumber, endColumn} of originalPlaceHolder.occurences) {
for (let { startLineNumber, startColumn, endLineNumber, endColumn } of originalPlaceHolder.occurences) {
if (startColumn > 1 || startLineNumber === 1) {
// placeholders that aren't at the beginning of new snippet lines

12
src/vs/editor/contrib/snippet/common/snippetController.ts
View file

@ -61,7 +61,7 @@ export class InsertSnippetController {
// sorted list of all placeholder occurences for subsequent lockups
const sortedOccurrences: editorCommon.IRange[] = [];
for (const {occurences} of adaptedSnippet.placeHolders) {
for (const { occurences } of adaptedSnippet.placeHolders) {
for (const range of occurences) {
sortedOccurrences.push(range);
}
@ -72,7 +72,7 @@ export class InsertSnippetController {
this.model.changeDecorations((changeAccessor) => {
for (let i = 0; i < adaptedSnippet.placeHolders.length; i++) {
const {occurences} = adaptedSnippet.placeHolders[i];
const { occurences } = adaptedSnippet.placeHolders[i];
const trackedRanges: string[] = [];
for (const range of occurences) {
@ -423,7 +423,7 @@ class BeforeAfterData {
next(selection: Selection) {
const data = BeforeAfterData.create(this._model, selection, this.overwriteBefore, this.overwriteAfter);
let {overwriteBefore, overwriteAfter} = data;
let { overwriteBefore, overwriteAfter } = data;
if (data._contentBefore !== this._contentBefore) {
overwriteBefore = 0;
}
@ -570,13 +570,13 @@ export class SnippetController {
.map((selection, i) => ({ selection, i }))
.sort((a, b) => Range.compareRangesUsingStarts(a.selection, b.selection));
for (const {selection, i} of selectionEntries) {
for (const { selection, i } of selectionEntries) {
// only use overwrite[Before|After] for secondary cursors
// when the same text as with the primary cursor is selected
const beforeAfter = i !== 0 ? primaryBeforeAfter.next(selection) : primaryBeforeAfter;
let {adaptedSnippet, typeRange} = SnippetController._prepareSnippet(
let { adaptedSnippet, typeRange } = SnippetController._prepareSnippet(
this._editor,
selection,
snippet,
@ -633,7 +633,7 @@ export class SnippetController {
// create new selections from the new selection offsets
// and restore the order we had at the beginning
const result: Selection[] = [];
for (const {offset, i} of newSelections) {
for (const { offset, i } of newSelections) {
const pos = model.getPositionAt(offset);
result[i] = new Selection(pos.lineNumber, pos.column, pos.lineNumber, pos.column);
}

2
src/vs/editor/contrib/snippet/common/snippetVariables.ts
View file

@ -37,7 +37,7 @@ export class SnippetVariablesResolver implements ISnippetVariableResolver {
}
private _tmCurrentLine(): string {
const {positionLineNumber} = this._editor.getSelection();
const { positionLineNumber } = this._editor.getSelection();
return this._editor.getModel().getValueInRange({ startLineNumber: positionLineNumber, startColumn: 1, endLineNumber: positionLineNumber, endColumn: Number.MAX_VALUE });
}

2
src/vs/editor/contrib/snippet/test/common/snippetParser.test.ts
View file

@ -142,7 +142,7 @@ suite('SnippetParser', () => {
assertEscapeAndMarker('foo${1:bar\\}${2:foo}}', 'foobar}foo', Text, Placeholder);
let [, placeholder] = new SnippetParser(true, false).parse('foo${1:bar\\}${2:foo}}');
let {defaultValue} = (<Placeholder>placeholder);
let { defaultValue } = (<Placeholder>placeholder);
assert.equal((<Placeholder>placeholder).name, '1');
assert.ok(defaultValue[0] instanceof Text);

2
src/vs/editor/test/common/services/editorSimpleWorker.test.ts
View file

@ -163,7 +163,7 @@ suite('EditorSimpleWorker', () => {
]);
return worker.textualSuggest(model.uri.toString(), { lineNumber: 2, column: 2 }, '[a-z]+', 'img').then((result) => {
const {suggestions} = result;
const { suggestions } = result;
assert.equal(suggestions.length, 1);
assert.equal(suggestions[0].label, 'foobar');
});

2
src/vs/platform/backup/electron-main/backupMainService.ts
View file

@ -186,7 +186,7 @@ export class BackupMainService implements IBackupMainService {
// Clean up stale backups
staleBackupWorkspaces.forEach(staleBackupWorkspace => {
const {backupPath, workspaceIdentifier, isEmptyWorkspace} = staleBackupWorkspace;
const { backupPath, workspaceIdentifier, isEmptyWorkspace } = staleBackupWorkspace;
try {
extfs.delSync(backupPath);

2
src/vs/platform/commands/common/commands.ts
View file

@ -71,7 +71,7 @@ export const CommandsRegistry: ICommandRegistry = new class implements ICommandR
command = { handler: commandOrDesc };
} else {
const {handler, description} = commandOrDesc;
const { handler, description } = commandOrDesc;
if (description) {
// add argument validation if rich command metadata is provided
const constraints: TypeConstraint[] = [];

2
src/vs/platform/extensionManagement/common/extensionEnablementService.ts
View file

@ -124,7 +124,7 @@ export class ExtensionEnablementService implements IExtensionEnablementService {
}
}
private onDidUninstallExtension({id, error}: DidUninstallExtensionEvent): void {
private onDidUninstallExtension({ id, error }: DidUninstallExtensionEvent): void {
if (!error) {
id = getIdAndVersionFromLocalExtensionId(id).id;
if (id) {

8
src/vs/platform/markers/common/markerService.ts
View file

@ -87,7 +87,7 @@ class MarkerStats implements MarkerStatistics {
return result;
}
for (const {severity} of this._service.read({ resource })) {
for (const { severity } of this._service.read({ resource })) {
if (severity === Severity.Error) {
result.errors += 1;
} else if (severity === Severity.Warning) {
@ -180,7 +180,7 @@ export class MarkerService implements IMarkerService {
}
private static _toMarker(owner: string, resource: URI, data: IMarkerData): IMarker {
let {code, severity, message, source, startLineNumber, startColumn, endLineNumber, endColumn} = data;
let { code, severity, message, source, startLineNumber, startColumn, endLineNumber, endColumn } = data;
if (!message) {
return undefined;
@ -230,7 +230,7 @@ export class MarkerService implements IMarkerService {
// group by resource
const groups: { [resource: string]: IMarker[] } = Object.create(null);
for (const {resource, marker: markerData} of data) {
for (const { resource, marker: markerData } of data) {
const marker = MarkerService._toMarker(owner, resource, markerData);
if (!marker) {
// filter bad markers
@ -259,7 +259,7 @@ export class MarkerService implements IMarkerService {
read(filter: { owner?: string; resource?: URI; take?: number; } = Object.create(null)): IMarker[] {
let {owner, resource, take} = filter;
let { owner, resource, take } = filter;
if (!take || take < 0) {
take = -1;

2
src/vs/platform/opener/browser/openerService.ts
View file

@ -26,7 +26,7 @@ export class OpenerService implements IOpenerService {
open(resource: URI, options?: { openToSide?: boolean }): TPromise<any> {
const {scheme, path, query, fragment} = resource;
const { scheme, path, query, fragment } = resource;
let promise: TPromise<any>;
if (scheme === Schemas.http || scheme === Schemas.https) {
// open http

2
src/vs/platform/telemetry/browser/errorTelemetry.ts
View file

@ -111,7 +111,7 @@ export default class ErrorTelemetry {
};
if (err) {
let {name, message, stack} = err;
let { name, message, stack } = err;
data.error = { name, message };
if (stack) {
data.stack = Array.isArray(err.stack)

2
src/vs/platform/telemetry/node/appInsightsAppender.ts
View file

@ -133,7 +133,7 @@ export class AppInsightsAppender implements ITelemetryAppender {
return;
}
data = mixin(data, this._defaultData);
let {properties, measurements} = AppInsightsAppender._getData(data);
let { properties, measurements } = AppInsightsAppender._getData(data);
this._aiClient.trackEvent(this._eventPrefix + '/' + eventName, properties, measurements);
}

4
src/vs/workbench/api/node/extHostDiagnostics.ts
View file

@ -80,7 +80,7 @@ export class DiagnosticCollection implements vscode.DiagnosticCollection {
.map((tuple, idx) => ({ tuple, idx }))
.sort(DiagnosticCollection._compareIndexedTuplesByUri);
for (const {tuple} of sortedTuples) {
for (const { tuple } of sortedTuples) {
const [uri, diagnostics] = tuple;
if (!lastUri || uri.toString() !== lastUri.toString()) {
if (lastUri && this._data.get(lastUri.toString()).length === 0) {
@ -241,7 +241,7 @@ export class ExtHostDiagnostics extends ExtHostDiagnosticsShape {
name = '_generated_diagnostic_collection_name_#' + ExtHostDiagnostics._idPool++;
}
const {_collections, _proxy} = this;
const { _collections, _proxy } = this;
const result = new class extends DiagnosticCollection {
constructor() {
super(name, _proxy);

2
src/vs/workbench/api/node/extHostMessageService.ts
View file

@ -40,7 +40,7 @@ export class ExtHostMessageService {
if (typeof command === 'string') {
commands.push({ title: command, handle, isCloseAffordance: false });
} else if (typeof command === 'object') {
let {title, isCloseAffordance} = command;
let { title, isCloseAffordance } = command;
commands.push({ title, isCloseAffordance, handle });
} else {
console.warn('Invalid message item:', command);

2
src/vs/workbench/api/node/mainThreadCommands.ts
View file

@ -59,7 +59,7 @@ CommandsRegistry.registerCommand('_generateCommandsDocumentation', function (acc
// add local commands
const commands = CommandsRegistry.getCommands();
for (let id in commands) {
let {description} = commands[id];
let { description } = commands[id];
if (description) {
result[id] = description;
}

2
src/vs/workbench/browser/fileResultsNavigation.ts
View file

@ -45,7 +45,7 @@ export default class FileResultsNavigation extends Disposable {
});
}
private onSelection({payload}: any): void {
private onSelection({ payload }: any): void {
if (payload && payload.fromFocus) {
return;
}

2
src/vs/workbench/browser/part.ts
View file

@ -114,7 +114,7 @@ export class PartLayout {
}
public layout(dimension: Dimension): Dimension[] {
const {width, height} = dimension;
const { width, height } = dimension;
// Return the applied sizes to title and content
const sizes: Dimension[] = [];

2
src/vs/workbench/browser/parts/editor/editorPicker.ts
View file

@ -124,7 +124,7 @@ export abstract class BaseEditorPicker extends QuickOpenHandler {
return false;
}
const {labelHighlights, descriptionHighlights} = QuickOpenEntry.highlight(e, searchValue, true /* fuzzy highlight */);
const { labelHighlights, descriptionHighlights } = QuickOpenEntry.highlight(e, searchValue, true /* fuzzy highlight */);
e.setHighlights(labelHighlights, descriptionHighlights);
return true;

2
src/vs/workbench/parts/debug/electron-browser/debugEditorContribution.ts
View file

@ -240,7 +240,7 @@ export class DebugEditorContribution implements IDebugEditorContribution {
private marginFreeFromNonDebugDecorations(line: number): boolean {
const decorations = this.editor.getLineDecorations(line);
if (decorations) {
for (const {options} of decorations) {
for (const { options } of decorations) {
if (options.glyphMarginClassName && options.glyphMarginClassName.indexOf('debug') === -1) {
return false;
}

12
src/vs/workbench/parts/extensions/electron-browser/extensionTipsService.ts
View file

@ -98,7 +98,7 @@ export class ExtensionTipsService implements IExtensionTipsService {
// group ids by pattern, like {**/*.md} -> [ext.foo1, ext.bar2]
this._availableRecommendations = Object.create(null);
forEach(extensionTips, entry => {
let {key: id, value: pattern} = entry;
let { key: id, value: pattern } = entry;
let ids = this._availableRecommendations[pattern];
if (!ids) {
this._availableRecommendations[pattern] = [id];
@ -108,8 +108,8 @@ export class ExtensionTipsService implements IExtensionTipsService {
});
forEach(product.extensionImportantTips, entry => {
let {key: id, value} = entry;
const {pattern} = value;
let { key: id, value } = entry;
const { pattern } = value;
let ids = this._availableRecommendations[pattern];
if (!ids) {
this._availableRecommendations[pattern] = [id];
@ -138,7 +138,7 @@ export class ExtensionTipsService implements IExtensionTipsService {
setImmediate(() => {
forEach(this._availableRecommendations, entry => {
let {key: pattern, value: ids} = entry;
let { key: pattern, value: ids } = entry;
if (match(pattern, uri.fsPath)) {
for (let id of ids) {
this._recommendations[id] = true;
@ -238,7 +238,7 @@ export class ExtensionTipsService implements IExtensionTipsService {
const result = Object.create(null);
forEach(product.extensionTips || empty, entry => {
let {key: id, value: pattern} = entry;
let { key: id, value: pattern } = entry;
if (match(pattern, str)) {
result[id] = true;
@ -246,7 +246,7 @@ export class ExtensionTipsService implements IExtensionTipsService {
});
forEach(product.extensionImportantTips || empty, entry => {
let {key: id, value} = entry;
let { key: id, value } = entry;
if (match(value.pattern, str)) {
result[id] = true;

2
src/vs/workbench/parts/extensions/node/extensionsWorkbenchService.ts
View file

@ -708,7 +708,7 @@ export class ExtensionsWorkbenchService implements IExtensionsWorkbenchService {
this._onChange.fire();
}
private onDidUninstallExtension({id, error}: DidUninstallExtensionEvent): void {
private onDidUninstallExtension({ id, error }: DidUninstallExtensionEvent): void {
if (!error) {
this.installed = this.installed.filter(e => e.local.id !== id);
}

2
src/vs/workbench/parts/git/browser/gitActions.contribution.ts
View file

@ -519,7 +519,7 @@ export class RevertRangesAction extends baseeditor.EditorInputAction {
public run(): TPromise<any> {
const selections = this.editor.getSelections();
const changes = getSelectedChanges(this.editor.getLineChanges(), selections);
const {original, modified} = this.editor.getModel();
const { original, modified } = this.editor.getModel();
const revertEdits = getChangeRevertEdits(original, modified, changes);

2
src/vs/workbench/parts/html/browser/htmlPreviewPart.ts
View file

@ -131,7 +131,7 @@ export class HtmlPreviewPart extends BaseEditor {
}
public layout(dimension: Dimension): void {
const {width, height} = dimension;
const { width, height } = dimension;
this._container.style.width = `${width}px`;
this._container.style.height = `${height}px`;
if (this._webview) {

6
src/vs/workbench/parts/markers/electron-browser/markersElectronContributions.ts
View file

@ -73,7 +73,7 @@ interface IActionDescriptor {
function registerAction(desc: IActionDescriptor) {
const {id, handler, title, category, iconClass, menu, keybinding} = desc;
const { id, handler, title, category, iconClass, menu, keybinding } = desc;
// 1) register as command
CommandsRegistry.registerCommand(id, handler);
@ -81,7 +81,7 @@ function registerAction(desc: IActionDescriptor) {
// 2) menus
let command = { id, title, iconClass, category };
if (menu) {
let {menuId, when, group} = menu;
let { menuId, when, group } = menu;
MenuRegistry.appendMenuItem(menuId, {
command,
when,
@ -91,7 +91,7 @@ function registerAction(desc: IActionDescriptor) {
// 3) keybindings
if (keybinding) {
let {when, weight, keys} = keybinding;
let { when, weight, keys } = keybinding;
KeybindingsRegistry.registerKeybindingRule({
id,
when,

6
src/vs/workbench/parts/output/browser/output.contribution.ts
View file

@ -80,7 +80,7 @@ interface IActionDescriptor {
function registerAction(desc: IActionDescriptor) {
const {id, handler, title, category, iconClass, f1, menu, keybinding} = desc;
const { id, handler, title, category, iconClass, f1, menu, keybinding } = desc;
// 1) register as command
CommandsRegistry.registerCommand(id, handler);
@ -93,7 +93,7 @@ function registerAction(desc: IActionDescriptor) {
// 3) menus
if (menu) {
let {menuId, when, group} = menu;
let { menuId, when, group } = menu;
MenuRegistry.appendMenuItem(menuId, {
command,
when,
@ -103,7 +103,7 @@ function registerAction(desc: IActionDescriptor) {
// 4) keybindings
if (keybinding) {
let {when, weight, keys} = keybinding;
let { when, weight, keys } = keybinding;
KeybindingsRegistry.registerKeybindingRule({
id,
when,

4
src/vs/workbench/parts/preferences/browser/preferencesEditor.ts
View file

@ -15,7 +15,7 @@ import { Registry } from 'vs/platform/platform';
import { toResource, SideBySideEditorInput, EditorOptions, EditorInput, IEditorRegistry, Extensions as EditorExtensions } from 'vs/workbench/common/editor';
import { BaseEditor, EditorDescriptor } from 'vs/workbench/browser/parts/editor/baseEditor';
import { ResourceEditorModel } from 'vs/workbench/common/editor/resourceEditorModel';
import { IEditorControl, IEditor, Position, Verbosity } from 'vs/platform/editor/common/editor';
import { IEditorControl, Position, Verbosity } from 'vs/platform/editor/common/editor';
import { ResourceEditorInput } from 'vs/workbench/common/editor/resourceEditorInput';
import * as editorCommon from 'vs/editor/common/editorCommon';
import { BaseTextEditor } from 'vs/workbench/browser/parts/editor/textEditor';
@ -253,7 +253,7 @@ class PreferencesRenderers extends Disposable {
this._defaultPreferencesRenderer = defaultPreferencesRenderer;
this._disposables = dispose(this._disposables);
this._defaultPreferencesRenderer.onUpdatePreference(({key, value, source}) => this._updatePreference(key, value, source, this._editablePreferencesRenderer), this, this._disposables);
this._defaultPreferencesRenderer.onUpdatePreference(({ key, value, source }) => this._updatePreference(key, value, source, this._editablePreferencesRenderer), this, this._disposables);
this._defaultPreferencesRenderer.onFocusPreference(preference => this._focusPreference(preference, this._editablePreferencesRenderer), this, this._disposables);
this._defaultPreferencesRenderer.onClearFocusPreference(preference => this._clearFocus(preference, this._editablePreferencesRenderer), this, this._disposables);
}

6
src/vs/workbench/parts/preferences/browser/preferencesRenderers.ts
View file

@ -81,7 +81,7 @@ export class UserSettingsRenderer extends Disposable implements IPreferencesRend
this.settingHighlighter = this._register(instantiationService.createInstance(SettingHighlighter, editor, this._onFocusPreference, this._onClearFocusPreference));
this.highlightPreferencesRenderer = this._register(instantiationService.createInstance(HighlightPreferencesRenderer, editor));
this.editSettingActionRenderer = this._register(this.instantiationService.createInstance(EditSettingRenderer, this.editor, this.preferencesModel, this.settingHighlighter));
this._register(this.editSettingActionRenderer.onUpdateSetting(({key, value, source}) => this.updatePreference(key, value, source)));
this._register(this.editSettingActionRenderer.onUpdateSetting(({ key, value, source }) => this.updatePreference(key, value, source)));
this._register(this.editor.getModel().onDidChangeContent(() => this.modelChangeDelayer.trigger(() => this.onModelChanged())));
}
@ -122,7 +122,7 @@ export class UserSettingsRenderer extends Disposable implements IPreferencesRend
}
private getSetting(setting: ISetting): ISetting {
const {key, overrideOf} = setting;
const { key, overrideOf } = setting;
if (overrideOf) {
const setting = this.getSetting(overrideOf);
for (const override of setting.overrides) {
@ -729,7 +729,7 @@ class EditSettingRenderer extends Disposable {
private marginFreeFromOtherDecorations(line: number): boolean {
const decorations = this.editor.getLineDecorations(line);
if (decorations) {
for (const {options} of decorations) {
for (const { options } of decorations) {
if (options.glyphMarginClassName && options.glyphMarginClassName.indexOf(EditPreferenceWidget.GLYPH_MARGIN_CLASS_NAME) === -1) {
return false;
}

4
src/vs/workbench/parts/preferences/browser/preferencesService.ts
View file

@ -309,7 +309,7 @@ export class PreferencesService extends Disposable implements IPreferencesServic
let setting = settingsModel.getPreference(languageKey);
const model = codeEditor.getModel();
const configuration = this.configurationService.getConfiguration<{ tabSize: number; insertSpaces: boolean }>('editor');
const {eol} = this.configurationService.getConfiguration<{ eol: string }>('files');
const { eol } = this.configurationService.getConfiguration<{ eol: string }>('files');
if (setting) {
if (setting.overrides.length) {
const lastSetting = setting.overrides[setting.overrides.length - 1];
@ -338,7 +338,7 @@ export class PreferencesService extends Disposable implements IPreferencesServic
});
}
private spaces(count: number, {tabSize, insertSpaces}: { tabSize: number; insertSpaces: boolean }): string {
private spaces(count: number, { tabSize, insertSpaces }: { tabSize: number; insertSpaces: boolean }): string {
return insertSpaces ? strings.repeat(' ', tabSize * count) : strings.repeat('\t', count);
}

4
src/vs/workbench/parts/preferences/test/common/keybindingsEditorModel.test.ts
View file

@ -602,9 +602,9 @@ suite('Keybindings Editor Model test', () => {
}
}
function aResolvedKeybindingItem({command, when, isDefault, firstPart, chordPart}: { command?: string, when?: string, isDefault?: boolean, firstPart?: { keyCode: KeyCode, modifiers?: Modifiers }, chordPart?: { keyCode: KeyCode, modifiers?: Modifiers } }): ResolvedKeybindingItem {
function aResolvedKeybindingItem({ command, when, isDefault, firstPart, chordPart }: { command?: string, when?: string, isDefault?: boolean, firstPart?: { keyCode: KeyCode, modifiers?: Modifiers }, chordPart?: { keyCode: KeyCode, modifiers?: Modifiers } }): ResolvedKeybindingItem {
const aSimpleKeybinding = function (part: { keyCode: KeyCode, modifiers?: Modifiers }): SimpleKeybinding {
const {ctrlKey, shiftKey, altKey, metaKey} = part.modifiers || { ctrlKey: false, shiftKey: false, altKey: false, metaKey: false };
const { ctrlKey, shiftKey, altKey, metaKey } = part.modifiers || { ctrlKey: false, shiftKey: false, altKey: false, metaKey: false };
return new SimpleKeybinding(ctrlKey, shiftKey, altKey, metaKey, part.keyCode);
};
const keybinding = firstPart ? chordPart ? new ChordKeybinding(aSimpleKeybinding(firstPart), aSimpleKeybinding(chordPart)) : aSimpleKeybinding(firstPart) : null;

2
src/vs/workbench/parts/quickopen/browser/viewPickerHandler.ts
View file

@ -87,7 +87,7 @@ export class ViewPickerHandler extends QuickOpenHandler {
return false;
}
const {labelHighlights, descriptionHighlights} = QuickOpenEntry.highlight(e, searchValue);
const { labelHighlights, descriptionHighlights } = QuickOpenEntry.highlight(e, searchValue);
e.setHighlights(labelHighlights, descriptionHighlights);
return true;

2
src/vs/workbench/parts/search/browser/openAnythingHandler.ts
View file

@ -194,7 +194,7 @@ export class OpenAnythingHandler extends QuickOpenHandler {
if (entry instanceof FileEntry) {
entry.setRange(searchWithRange ? searchWithRange.range : null);
const {labelHighlights, descriptionHighlights} = QuickOpenEntry.highlight(entry, searchValue, true /* fuzzy highlight */);
const { labelHighlights, descriptionHighlights } = QuickOpenEntry.highlight(entry, searchValue, true /* fuzzy highlight */);
entry.setHighlights(labelHighlights, descriptionHighlights);
}
});

2
src/vs/workbench/parts/welcome/walkThrough/electron-browser/walkThroughPart.ts
View file

@ -431,7 +431,7 @@ export class WalkThroughPart extends BaseEditor {
private style(div: HTMLElement) {
const styleElement = this.partService.getContainer(Parts.EDITOR_PART); // TODO@theme styles should come in via theme registry
const {color, backgroundColor, fontFamily, fontWeight, fontSize} = window.getComputedStyle(styleElement);
const { color, backgroundColor, fontFamily, fontWeight, fontSize } = window.getComputedStyle(styleElement);
div.style.color = color;
div.style.backgroundColor = backgroundColor;
div.style.fontFamily = fontFamily;

4
src/vs/workbench/services/configuration/node/configurationEditingService.ts
View file

@ -127,9 +127,9 @@ export class ConfigurationEditingService implements IConfigurationEditingService
}
private getEdits(model: editorCommon.IModel, edit: IConfigurationEditOperation): Edit[] {
const {tabSize, insertSpaces} = model.getOptions();
const { tabSize, insertSpaces } = model.getOptions();
const eol = model.getEOL();
const {key, value, overrideIdentifier} = edit;
const { key, value, overrideIdentifier } = edit;
// Without key, the entire settings file is being replaced, so we just use JSON.stringify
if (!key) {

10
src/vs/workbench/services/keybinding/common/keybindingEditing.ts
View file

@ -113,7 +113,7 @@ export class KeybindingsEditingService extends Disposable implements IKeybinding
}
private updateUserKeybinding(newKey: string, keybindingItem: ResolvedKeybindingItem, model: editorCommon.IModel): void {
const {tabSize, insertSpaces} = model.getOptions();
const { tabSize, insertSpaces } = model.getOptions();
const eol = model.getEOL();
const userKeybindingEntries = <IUserFriendlyKeybinding[]>json.parse(model.getValue());
const userKeybindingEntryIndex = this.findUserKeybindingEntryIndex(keybindingItem, userKeybindingEntries);
@ -123,7 +123,7 @@ export class KeybindingsEditingService extends Disposable implements IKeybinding
}
private updateDefaultKeybinding(newKey: string, keybindingItem: ResolvedKeybindingItem, model: editorCommon.IModel): void {
const {tabSize, insertSpaces} = model.getOptions();
const { tabSize, insertSpaces } = model.getOptions();
const eol = model.getEOL();
const userKeybindingEntries = <IUserFriendlyKeybinding[]>json.parse(model.getValue());
const userKeybindingEntryIndex = this.findUserKeybindingEntryIndex(keybindingItem, userKeybindingEntries);
@ -141,7 +141,7 @@ export class KeybindingsEditingService extends Disposable implements IKeybinding
}
private removeUserKeybinding(keybindingItem: ResolvedKeybindingItem, model: editorCommon.IModel): void {
const {tabSize, insertSpaces} = model.getOptions();
const { tabSize, insertSpaces } = model.getOptions();
const eol = model.getEOL();
const userKeybindingEntries = <IUserFriendlyKeybinding[]>json.parse(model.getValue());
const userKeybindingEntryIndex = this.findUserKeybindingEntryIndex(keybindingItem, userKeybindingEntries);
@ -151,13 +151,13 @@ export class KeybindingsEditingService extends Disposable implements IKeybinding
}
private removeDefaultKeybinding(keybindingItem: ResolvedKeybindingItem, model: editorCommon.IModel): void {
const {tabSize, insertSpaces} = model.getOptions();
const { tabSize, insertSpaces } = model.getOptions();
const eol = model.getEOL();
this.applyEditsToBuffer(setProperty(model.getValue(), [-1], this.asObject(keybindingItem.resolvedKeybinding.getUserSettingsLabel(), keybindingItem.command, keybindingItem.when, true), { tabSize, insertSpaces, eol })[0], model);
}
private removeUnassignedDefaultKeybinding(keybindingItem: ResolvedKeybindingItem, model: editorCommon.IModel): void {
const {tabSize, insertSpaces} = model.getOptions();
const { tabSize, insertSpaces } = model.getOptions();
const eol = model.getEOL();
const userKeybindingEntries = <IUserFriendlyKeybinding[]>json.parse(model.getValue());
const index = this.findUnassignedDefaultKeybindingEntryIndex(keybindingItem, userKeybindingEntries);

4
src/vs/workbench/services/keybinding/test/keybindingEditing.test.ts
View file

@ -215,9 +215,9 @@ suite('Keybindings Editing', () => {
return json.parse(fs.readFileSync(keybindingsFile).toString('utf8'));
}
function aResolvedKeybindingItem({command, when, isDefault, firstPart, chordPart}: { command?: string, when?: string, isDefault?: boolean, firstPart?: { keyCode: KeyCode, modifiers?: Modifiers }, chordPart?: { keyCode: KeyCode, modifiers?: Modifiers } }): ResolvedKeybindingItem {
function aResolvedKeybindingItem({ command, when, isDefault, firstPart, chordPart }: { command?: string, when?: string, isDefault?: boolean, firstPart?: { keyCode: KeyCode, modifiers?: Modifiers }, chordPart?: { keyCode: KeyCode, modifiers?: Modifiers } }): ResolvedKeybindingItem {
const aSimpleKeybinding = function (part: { keyCode: KeyCode, modifiers?: Modifiers }): SimpleKeybinding {
const {ctrlKey, shiftKey, altKey, metaKey} = part.modifiers || { ctrlKey: false, shiftKey: false, altKey: false, metaKey: false };
const { ctrlKey, shiftKey, altKey, metaKey } = part.modifiers || { ctrlKey: false, shiftKey: false, altKey: false, metaKey: false };
return new SimpleKeybinding(ctrlKey, shiftKey, altKey, metaKey, part.keyCode);
};
const keybinding = firstPart ? chordPart ? new ChordKeybinding(aSimpleKeybinding(firstPart), aSimpleKeybinding(chordPart)) : aSimpleKeybinding(firstPart) : null;

2
src/vs/workbench/services/progress/browser/progressService2.ts
View file

@ -89,7 +89,7 @@ export class ProgressService2 implements IProgressService2 {
if (this._stack.length === 0) {
WindowProgressItem.Instance.hide();
} else {
const {title, progress} = this._stack[0];
const { title, progress } = this._stack[0];
WindowProgressItem.Instance.text = progress.value || title;
WindowProgressItem.Instance.show();
}