Skip to content

Commit 69ddf8a

Browse files
committed
Fixes microsoft#27811: Add editor.multicursorModifier to most common editor settings
1 parent 5b473bb commit 69ddf8a

2 files changed

Lines changed: 64 additions & 49 deletions

File tree

src/vs/platform/telemetry/common/telemetryUtils.ts

Lines changed: 61 additions & 47 deletions
Original file line numberDiff line numberDiff line change
@@ -190,82 +190,96 @@ export function telemetryURIDescriptor(uri: URI): URIDescriptor {
190190
* Only add settings that cannot contain any personal/private information of users (PII).
191191
*/
192192
const configurationValueWhitelist = [
193-
'window.zoomLevel',
194-
'editor.fontSize',
193+
'editor.tabCompletion',
195194
'editor.fontFamily',
195+
'editor.fontWeight',
196+
'editor.fontSize',
197+
'editor.lineHeight',
198+
'editor.letterSpacing',
199+
'editor.lineNumbers',
200+
'editor.rulers',
201+
'editor.wordSeparators',
196202
'editor.tabSize',
203+
'editor.insertSpaces',
204+
'editor.detectIndentation',
205+
'editor.roundedSelection',
206+
'editor.scrollBeyondLastLine',
207+
'editor.minimap.enabled',
208+
'editor.minimap.renderCharacters',
209+
'editor.minimap.maxColumn',
210+
'editor.find.seedSearchStringFromSelection',
211+
'editor.find.autoFindInSelection',
212+
'editor.wordWrap',
213+
'editor.wordWrapColumn',
214+
'editor.wrappingIndent',
215+
'editor.mouseWheelScrollSensitivity',
216+
'editor.multiCursorModifier',
217+
'editor.quickSuggestions',
218+
'editor.quickSuggestionsDelay',
219+
'editor.parameterHints',
220+
'editor.autoClosingBrackets',
221+
'editor.formatOnType',
222+
'editor.formatOnPaste',
223+
'editor.suggestOnTriggerCharacters',
224+
'editor.acceptSuggestionOnEnter',
225+
'editor.acceptSuggestionOnCommitCharacter',
226+
'editor.snippetSuggestions',
227+
'editor.emptySelectionClipboard',
228+
'editor.wordBasedSuggestions',
229+
'editor.suggestFontSize',
230+
'editor.suggestLineHeight',
231+
'editor.selectionHighlight',
232+
'editor.occurrencesHighlight',
233+
'editor.overviewRulerLanes',
234+
'editor.overviewRulerBorder',
235+
'editor.cursorBlinking',
236+
'editor.cursorStyle',
237+
'editor.mouseWheelZoom',
238+
'editor.fontLigatures',
239+
'editor.hideCursorInOverviewRuler',
240+
'editor.renderWhitespace',
241+
'editor.renderControlCharacters',
242+
'editor.renderIndentGuides',
243+
'editor.renderLineHighlight',
244+
'editor.codeLens',
245+
'editor.folding',
246+
'editor.showFoldingControls',
247+
'editor.matchBrackets',
248+
'editor.glyphMargin',
249+
'editor.useTabStops',
250+
'editor.trimAutoWhitespace',
251+
'editor.stablePeek',
252+
'editor.dragAndDrop',
253+
'editor.formatOnSave',
254+
255+
'window.zoomLevel',
197256
'files.autoSave',
198257
'files.hotExit',
199258
'typescript.check.tscVersion',
200-
'editor.renderWhitespace',
201-
'editor.cursorBlinking',
202-
'editor.cursorStyle',
203259
'files.associations',
204260
'workbench.statusBar.visible',
205-
'editor.wordWrap',
206-
'editor.wordWrapColumn',
207-
'editor.insertSpaces',
208-
'editor.renderIndentGuides',
209261
'files.trimTrailingWhitespace',
210262
'git.confirmSync',
211-
'editor.rulers',
212263
'workbench.sideBar.location',
213-
'editor.fontLigatures',
214-
'editor.wordWrap',
215-
'editor.lineHeight',
216-
'editor.detectIndentation',
217-
'editor.formatOnType',
218-
'editor.formatOnSave',
219-
'editor.formatOnPaste',
220-
'editor.dragAndDrop',
221264
'window.openFilesInNewWindow',
222265
'javascript.validate.enable',
223-
'editor.mouseWheelZoom',
224-
'editor.fontWeight',
225-
'editor.scrollBeyondLastLine',
226-
'editor.lineNumbers',
227-
'editor.letterSpacing',
228-
'editor.wrappingIndent',
229-
'editor.renderControlCharacters',
230-
'editor.autoClosingBrackets',
231266
'window.reopenFolders',
232267
'extensions.autoUpdate',
233-
'editor.tabCompletion',
234268
'files.eol',
235269
'explorer.openEditors.visible',
236270
'workbench.editor.enablePreview',
237271
'files.autoSaveDelay',
238-
'editor.roundedSelection',
239-
'editor.quickSuggestions',
240-
'editor.acceptSuggestionOnEnter',
241-
'editor.acceptSuggestionOnCommitCharacter',
242272
'workbench.editor.showTabs',
243273
'files.encoding',
244274
'files.autoGuessEncoding',
245-
'editor.quickSuggestionsDelay',
246-
'editor.snippetSuggestions',
247-
'editor.selectionHighlight',
248-
'editor.occurrencesHighlight',
249-
'editor.glyphMargin',
250-
'editor.wordSeparators',
251-
'editor.mouseWheelScrollSensitivity',
252-
'editor.suggestOnTriggerCharacters',
253275
'git.enabled',
254276
'http.proxyStrictSSL',
255277
'terminal.integrated.fontFamily',
256-
'editor.overviewRulerLanes',
257-
'editor.overviewRulerBorder',
258-
'editor.wordBasedSuggestions',
259-
'editor.hideCursorInOverviewRuler',
260-
'editor.trimAutoWhitespace',
261-
'editor.folding',
262-
'editor.matchBrackets',
263278
'workbench.editor.enablePreviewFromQuickOpen',
264279
'workbench.editor.swipeToNavigate',
265280
'php.builtInCompletions.enable',
266281
'php.validate.enable',
267282
'php.validate.run',
268-
'editor.parameterHints',
269283
'workbench.welcome.enabled',
270284
];
271285

src/vs/workbench/parts/preferences/browser/preferencesService.ts

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -289,15 +289,16 @@ export class PreferencesService extends Disposable implements IPreferencesServic
289289

290290
private fetchMostCommonlyUsedSettings(): TPromise<string[]> {
291291
return TPromise.wrap([
292-
'editor.fontSize',
293292
'files.autoSave',
293+
'editor.fontSize',
294294
'editor.fontFamily',
295295
'editor.tabSize',
296296
'editor.renderWhitespace',
297-
'files.exclude',
298297
'editor.cursorStyle',
298+
'editor.multiCursorModifier',
299299
'editor.insertSpaces',
300300
'editor.wordWrap',
301+
'files.exclude',
301302
'files.associations'
302303
]);
303304
}

0 commit comments

Comments
 (0)