Skip to content

Commit

Permalink
indentation changes
Browse files Browse the repository at this point in the history
  • Loading branch information
kieferrm committed Sep 26, 2017
1 parent f244a4f commit 08d8f0f
Show file tree
Hide file tree
Showing 88 changed files with 1,119 additions and 1,120 deletions.
50 changes: 25 additions & 25 deletions extensions/git/src/commands.ts
Expand Up @@ -265,10 +265,10 @@ export class CommandCenter {

if (!url) {
/* __GDPR__
"clone" : {
"outcome" : { "classification": "SystemMetaData", "purpose": "FeatureInsight" }
}
*/
"clone" : {
"outcome" : { "classification": "SystemMetaData", "purpose": "FeatureInsight" }
}
*/
this.telemetryReporter.sendTelemetryEvent('clone', { outcome: 'no_URL' });
return;
}
Expand All @@ -284,10 +284,10 @@ export class CommandCenter {

if (!parentPath) {
/* __GDPR__
"clone" : {
"outcome" : { "classification": "SystemMetaData", "purpose": "FeatureInsight" }
}
*/
"clone" : {
"outcome" : { "classification": "SystemMetaData", "purpose": "FeatureInsight" }
}
*/
this.telemetryReporter.sendTelemetryEvent('clone', { outcome: 'no_directory' });
return;
}
Expand All @@ -306,29 +306,29 @@ export class CommandCenter {

const openFolder = result === open;
/* __GDPR__
"clone" : {
"outcome" : { "classification": "SystemMetaData", "purpose": "FeatureInsight" },
"openFolder": { "classification": "SystemMetaData", "purpose": "PerformanceAndHealth", "isMeasurement": true }
}
*/
"clone" : {
"outcome" : { "classification": "SystemMetaData", "purpose": "FeatureInsight" },
"openFolder": { "classification": "SystemMetaData", "purpose": "PerformanceAndHealth", "isMeasurement": true }
}
*/
this.telemetryReporter.sendTelemetryEvent('clone', { outcome: 'success' }, { openFolder: openFolder ? 1 : 0 });
if (openFolder) {
commands.executeCommand('vscode.openFolder', Uri.file(repositoryPath));
}
} catch (err) {
if (/already exists and is not an empty directory/.test(err && err.stderr || '')) {
/* __GDPR__
"clone" : {
"outcome" : { "classification": "SystemMetaData", "purpose": "FeatureInsight" }
}
*/
"clone" : {
"outcome" : { "classification": "SystemMetaData", "purpose": "FeatureInsight" }
}
*/
this.telemetryReporter.sendTelemetryEvent('clone', { outcome: 'directory_not_empty' });
} else {
/* __GDPR__
"clone" : {
"outcome" : { "classification": "SystemMetaData", "purpose": "FeatureInsight" }
}
*/
"clone" : {
"outcome" : { "classification": "SystemMetaData", "purpose": "FeatureInsight" }
}
*/
this.telemetryReporter.sendTelemetryEvent('clone', { outcome: 'error' });
}
throw err;
Expand Down Expand Up @@ -1342,10 +1342,10 @@ export class CommandCenter {
}

/* __GDPR__
"git.command" : {
"command" : { "classification": "SystemMetaData", "purpose": "FeatureInsight" }
}
*/
"git.command" : {
"command" : { "classification": "SystemMetaData", "purpose": "FeatureInsight" }
}
*/
this.telemetryReporter.sendTelemetryEvent('git.command', { command: id });

return result.catch(async err => {
Expand Down
10 changes: 5 additions & 5 deletions extensions/markdown/src/extension.ts
Expand Up @@ -261,11 +261,11 @@ function showPreview(cspArbiter: ExtensionContentSecurityPolicyArbiter, uri?: vs

if (telemetryReporter) {
/* __GDPR__
"openPreview" : {
"where" : { "classification": "SystemMetaData", "purpose": "FeatureInsight" },
"how": { "classification": "SystemMetaData", "purpose": "FeatureInsight" }
}
*/
"openPreview" : {
"where" : { "classification": "SystemMetaData", "purpose": "FeatureInsight" },
"how": { "classification": "SystemMetaData", "purpose": "FeatureInsight" }
}
*/
telemetryReporter.sendTelemetryEvent('openPreview', {
where: sideBySide ? 'sideBySide' : 'inPlace',
how: (uri instanceof vscode.Uri) ? 'action' : 'pallete'
Expand Down
36 changes: 18 additions & 18 deletions extensions/typescript/src/typescriptServiceClient.ts
Expand Up @@ -387,10 +387,10 @@ export default class TypeScriptServiceClient implements ITypescriptServiceClient
this.error('Starting TSServer failed with error.', err);
window.showErrorMessage(localize('serverCouldNotBeStarted', 'TypeScript language server couldn\'t be started. Error message is: {0}', err.message || err));
/* __GDPR__
"error" : {
"message": { "classification": "CustomerContent", "purpose": "PerformanceAndHealth" }
}
*/
"error" : {
"message": { "classification": "CustomerContent", "purpose": "PerformanceAndHealth" }
}
*/
this.logTelemetry('error', { message: err.message });
return;
}
Expand All @@ -402,8 +402,8 @@ export default class TypeScriptServiceClient implements ITypescriptServiceClient
this.error(`TSServer log file: ${this.tsServerLogFile}`);
}
/* __GDPR__
"tsserver.error" : {}
*/
"tsserver.error" : {}
*/
this.logTelemetry('tsserver.error');
this.serviceExited(false);
});
Expand All @@ -413,10 +413,10 @@ export default class TypeScriptServiceClient implements ITypescriptServiceClient
} else {
this.error(`TSServer exited with code: ${code}`);
/* __GDPR__
"tsserver.exitWithCode" : {
"code" : { "classification": "SystemMetaData", "purpose": "PerformanceAndHealth" }
}
*/
"tsserver.exitWithCode" : {
"code" : { "classification": "SystemMetaData", "purpose": "PerformanceAndHealth" }
}
*/
this.logTelemetry('tsserver.exitWithCode', { code: code });
}

Expand Down Expand Up @@ -562,8 +562,8 @@ export default class TypeScriptServiceClient implements ITypescriptServiceClient
isCloseAffordance: true
});
/* __GDPR__
"serviceExited" : {}
*/
"serviceExited" : {}
*/
this.logTelemetry('serviceExited');
} else if (diff < 60 * 1000 /* 1 Minutes */) {
this.lastStart = Date.now();
Expand Down Expand Up @@ -852,12 +852,12 @@ export default class TypeScriptServiceClient implements ITypescriptServiceClient
break;
}
/* __GDPR__
"typingsInstalled" : {
"installedPackages" : { "classification": "PublicNonPersonalData", "purpose": "FeatureInsight" },
"installSuccess": { "classification": "SystemMetaData", "purpose": "PerformanceAndHealth" },
"typingsInstallerVersion": { "classification": "SystemMetaData", "purpose": "PerformanceAndHealth" }
}
*/
"typingsInstalled" : {
"installedPackages" : { "classification": "PublicNonPersonalData", "purpose": "FeatureInsight" },
"installSuccess": { "classification": "SystemMetaData", "purpose": "PerformanceAndHealth" },
"typingsInstallerVersion": { "classification": "SystemMetaData", "purpose": "PerformanceAndHealth" }
}
*/
// __GDPR__COMMENT__: Other events are defined by TypeScript.
this.logTelemetry(telemetryData.telemetryEventName, properties);
}
Expand Down
4 changes: 2 additions & 2 deletions extensions/typescript/src/utils/projectStatus.ts
Expand Up @@ -55,8 +55,8 @@ class ExcludeHintItem {
this._item.color = '#A5DF3B';
this._item.show();
/* __GDPR__
"js.hintProjectExcludes" : {}
*/
"js.hintProjectExcludes" : {}
*/
this._client.logTelemetry('js.hintProjectExcludes');
}
}
Expand Down
38 changes: 19 additions & 19 deletions src/typings/native-keymap.d.ts
Expand Up @@ -43,27 +43,27 @@ declare module 'native-keymap' {
export function getKeyMap(): IKeyboardMapping;

/* __GDPR__FRAGMENT__
"IKeyboardLayoutInfo" : {
"name" : { "classification": "SystemMetaData", "purpose": "FeatureInsight" },
"id": { "classification": "SystemMetaData", "purpose": "FeatureInsight" },
"text": { "classification": "SystemMetaData", "purpose": "FeatureInsight" }
}
*/
"IKeyboardLayoutInfo" : {
"name" : { "classification": "SystemMetaData", "purpose": "FeatureInsight" },
"id": { "classification": "SystemMetaData", "purpose": "FeatureInsight" },
"text": { "classification": "SystemMetaData", "purpose": "FeatureInsight" }
}
*/
export interface IWindowsKeyboardLayoutInfo {
name: string;
id: string;
text: string;
}

/* __GDPR__FRAGMENT__
"IKeyboardLayoutInfo" : {
"model" : { "classification": "SystemMetaData", "purpose": "FeatureInsight" },
"layout": { "classification": "SystemMetaData", "purpose": "FeatureInsight" },
"variant": { "classification": "SystemMetaData", "purpose": "FeatureInsight" },
"options": { "classification": "SystemMetaData", "purpose": "FeatureInsight" },
"rules": { "classification": "SystemMetaData", "purpose": "FeatureInsight" }
}
*/
"IKeyboardLayoutInfo" : {
"model" : { "classification": "SystemMetaData", "purpose": "FeatureInsight" },
"layout": { "classification": "SystemMetaData", "purpose": "FeatureInsight" },
"variant": { "classification": "SystemMetaData", "purpose": "FeatureInsight" },
"options": { "classification": "SystemMetaData", "purpose": "FeatureInsight" },
"rules": { "classification": "SystemMetaData", "purpose": "FeatureInsight" }
}
*/
export interface ILinuxKeyboardLayoutInfo {
model: string;
layout: string;
Expand All @@ -73,11 +73,11 @@ declare module 'native-keymap' {
}

/* __GDPR__FRAGMENT__
"IKeyboardLayoutInfo" : {
"id" : { "classification": "SystemMetaData", "purpose": "FeatureInsight" },
"lang": { "classification": "SystemMetaData", "purpose": "FeatureInsight" }
}
*/
"IKeyboardLayoutInfo" : {
"id" : { "classification": "SystemMetaData", "purpose": "FeatureInsight" },
"lang": { "classification": "SystemMetaData", "purpose": "FeatureInsight" }
}
*/
export interface IMacKeyboardLayoutInfo {
id: string;
lang: string;
Expand Down
22 changes: 11 additions & 11 deletions src/vs/base/parts/quickopen/browser/quickOpenWidget.ts
Expand Up @@ -533,12 +533,12 @@ export class QuickOpenWidget implements IModelProvider {
const indexOfAcceptedElement = this.model.entries.indexOf(value);
const entriesCount = this.model.entries.length;
/* __GDPR__
"quickOpenWidgetItemAccepted" : {
"index" : { "classification": "SystemMetaData", "purpose": "FeatureInsight" },
"count": { "classification": "SystemMetaData", "purpose": "FeatureInsight" },
"isQuickNavigate": { "classification": "SystemMetaData", "purpose": "FeatureInsight" }
}
*/
"quickOpenWidgetItemAccepted" : {
"index" : { "classification": "SystemMetaData", "purpose": "FeatureInsight" },
"count": { "classification": "SystemMetaData", "purpose": "FeatureInsight" },
"isQuickNavigate": { "classification": "SystemMetaData", "purpose": "FeatureInsight" }
}
*/
this.usageLogger.publicLog('quickOpenWidgetItemAccepted', { index: indexOfAcceptedElement, count: entriesCount, isQuickNavigate: this.quickNavigateConfiguration ? true : false });
}

Expand Down Expand Up @@ -781,11 +781,11 @@ export class QuickOpenWidget implements IModelProvider {
const entriesCount = this.model.entries.filter(e => this.isElementVisible(this.model, e)).length;
if (this.usageLogger) {
/* __GDPR__
"quickOpenWidgetCancelled" : {
"count" : { "classification": "SystemMetaData", "purpose": "FeatureInsight" },
"isQuickNavigate": { "classification": "SystemMetaData", "purpose": "FeatureInsight" }
}
*/
"quickOpenWidgetCancelled" : {
"count" : { "classification": "SystemMetaData", "purpose": "FeatureInsight" },
"isQuickNavigate": { "classification": "SystemMetaData", "purpose": "FeatureInsight" }
}
*/
this.usageLogger.publicLog('quickOpenWidgetCancelled', { count: entriesCount, isQuickNavigate: this.quickNavigateConfiguration ? true : false });
}
}
Expand Down
8 changes: 4 additions & 4 deletions src/vs/base/parts/quickopen/common/quickOpen.ts
Expand Up @@ -7,10 +7,10 @@
import { ResolvedKeybinding } from 'vs/base/common/keyCodes';

/* __GDPR__FRAGMENT__
"IQuickNavigateConfiguration" : {
"keybindings" : { "classification": "SystemMetaData", "purpose": "FeatureInsight" }
}
*/
"IQuickNavigateConfiguration" : {
"keybindings" : { "classification": "SystemMetaData", "purpose": "FeatureInsight" }
}
*/
export interface IQuickNavigateConfiguration {
keybindings: ResolvedKeybinding[];
}
Expand Down
10 changes: 5 additions & 5 deletions src/vs/code/electron-main/menus.ts
Expand Up @@ -1240,11 +1240,11 @@ export class CodeMenu {

private reportMenuActionTelemetry(id: string): void {
/* __GDPR__
"workbencActionExecuted" : {
"id" : { "classification": "SystemMetaData", "purpose": "FeatureInsight" },
"from": { "classification": "SystemMetaData", "purpose": "FeatureInsight" }
}
*/
"workbencActionExecuted" : {
"id" : { "classification": "SystemMetaData", "purpose": "FeatureInsight" },
"from": { "classification": "SystemMetaData", "purpose": "FeatureInsight" }
}
*/
this.telemetryService.publicLog('workbenchActionExecuted', { id, from: telemetryFrom });
}

Expand Down
4 changes: 2 additions & 2 deletions src/vs/editor/common/commonCodeEditor.ts
Expand Up @@ -1005,8 +1005,8 @@ export abstract class CommonCodeEditor extends Disposable implements editorCommo
protected abstract _resolveDecorationOptions(typeKey: string, writable: boolean): editorCommon.IModelDecorationOptions;

/* __GDPR__FRAGMENT__
"EditorTelemetryData" : {}
*/
"EditorTelemetryData" : {}
*/
public getTelemetryData(): { [key: string]: any; } {
return null;
}
Expand Down
16 changes: 8 additions & 8 deletions src/vs/editor/common/editorCommonExtensions.ts
Expand Up @@ -195,14 +195,14 @@ export abstract class EditorAction extends EditorCommand {

protected reportTelemetry(accessor: ServicesAccessor, editor: editorCommon.ICommonCodeEditor) {
/* __GDPR__
"editorActionInvoked" : {
"name" : { "classification": "SystemMetaData", "purpose": "FeatureInsight" },
"id": { "classification": "SystemMetaData", "purpose": "FeatureInsight" },
"${include}": [
"${EditorTelemetryData}"
]
}
*/
"editorActionInvoked" : {
"name" : { "classification": "SystemMetaData", "purpose": "FeatureInsight" },
"id": { "classification": "SystemMetaData", "purpose": "FeatureInsight" },
"${include}": [
"${EditorTelemetryData}"
]
}
*/
accessor.get(ITelemetryService).publicLog('editorActionInvoked', { name: this.label, id: this.id, ...editor.getTelemetryData() });
}

Expand Down
14 changes: 7 additions & 7 deletions src/vs/editor/contrib/gotoError/browser/gotoError.ts
Expand Up @@ -407,13 +407,13 @@ class MarkerNavigationAction extends EditorAction {

let model = controller.getOrCreateModel();
/* __GDPR__
"zoneWidgetShown" : {
"mode" : { "classification": "SystemMetaData", "purpose": "FeatureInsight" },
"${include}": [
"${EditorTelemetryData}"
]
}
*/
"zoneWidgetShown" : {
"mode" : { "classification": "SystemMetaData", "purpose": "FeatureInsight" },
"${include}": [
"${EditorTelemetryData}"
]
}
*/
telemetryService.publicLog('zoneWidgetShown', { mode: 'go to error', ...editor.getTelemetryData() });
if (model) {
if (this._isNext) {
Expand Down

0 comments on commit 08d8f0f

Please sign in to comment.