@codingame/monaco-vscode-api 4.5.0 → 4.5.2

package/vscode/src/vs/workbench/services/preferences/browser/keybindingsEditorModel.js

@@ -14,22 +14,11 @@ import { isString, isEmptyObject } from '../../../../base/common/types.js';
 import { IExtensionService } from '../../extensions/common/extensions.service.js';
 import { ExtensionIdentifier, ExtensionIdentifierMap } from '../../../../platform/extensions/common/extensions.js';
 var KeybindingsEditorModel_1;
+const _moduleId = "vs/workbench/services/preferences/browser/keybindingsEditorModel";
 const KEYBINDING_ENTRY_TEMPLATE_ID = 'keybinding.entry.template';
-const SOURCE_SYSTEM = ( localizeWithPath(
-    'vs/workbench/services/preferences/browser/keybindingsEditorModel',
-    'default',
-    "System"
-));
-const SOURCE_EXTENSION = ( localizeWithPath(
-    'vs/workbench/services/preferences/browser/keybindingsEditorModel',
-    'extension',
-    "Extension"
-));
-const SOURCE_USER = ( localizeWithPath(
-    'vs/workbench/services/preferences/browser/keybindingsEditorModel',
-    'user',
-    "User"
-));
+const SOURCE_SYSTEM = ( localizeWithPath(_moduleId, 0, "System"));
+const SOURCE_EXTENSION = ( localizeWithPath(_moduleId, 1, "Extension"));
+const SOURCE_USER = ( localizeWithPath(_moduleId, 2, "User"));
 const wordFilter = or(matchesPrefix, matchesWords, matchesContiguousSubString);
 const SOURCE_REGEX = /@source:\s*(user|default|system|extension)/i;
 const EXTENSION_REGEX = /@ext:\s*((".+")|([^\s]+))/i;
@@ -50,10 +39,12 @@ let KeybindingsEditorModel = KeybindingsEditorModel_1 = class KeybindingsEditorM
         let keybindingItems = sortByPrecedence ? this._keybindingItemsSortedByPrecedence : this._keybindingItems;
         const commandIdMatches = /@command:\s*(.+)/i.exec(searchValue);
         if (commandIdMatches && commandIdMatches[1]) {
-            return ( keybindingItems.filter(k => k.command === commandIdMatches[1])
-                .map(
-                keybindingItem => ({ id: KeybindingsEditorModel_1.getId(keybindingItem), keybindingItem, templateId: KEYBINDING_ENTRY_TEMPLATE_ID })
-            ));
+            return (
+                 (keybindingItems.filter(k => k.command === commandIdMatches[1])
+                    .map(
+                    keybindingItem => ({ id: KeybindingsEditorModel_1.getId(keybindingItem), keybindingItem, templateId: KEYBINDING_ENTRY_TEMPLATE_ID })
+                ))
+            );
         }
         if (SOURCE_REGEX.test(searchValue)) {
             keybindingItems = this.filterBySource(keybindingItems, searchValue);
@@ -75,9 +66,11 @@ let KeybindingsEditorModel = KeybindingsEditorModel_1 = class KeybindingsEditorM
         }
         searchValue = searchValue.trim();
         if (!searchValue) {
-            return ( keybindingItems.map(
-                keybindingItem => ({ id: KeybindingsEditorModel_1.getId(keybindingItem), keybindingItem, templateId: KEYBINDING_ENTRY_TEMPLATE_ID })
-            ));
+            return (
+                 (keybindingItems.map(
+                    keybindingItem => ({ id: KeybindingsEditorModel_1.getId(keybindingItem), keybindingItem, templateId: KEYBINDING_ENTRY_TEMPLATE_ID })
+                ))
+            );
         }
         return this.filterByText(keybindingItems, searchValue);
     }
@@ -112,14 +105,14 @@ let KeybindingsEditorModel = KeybindingsEditorModel_1 = class KeybindingsEditorM
         const words = searchValue.split(' ');
         const keybindingWords = this.splitKeybindingWords(words);
         for (const keybindingItem of keybindingItems) {
-            const keybindingMatches = ( new KeybindingItemMatches(
+            const keybindingMatches = ( (new KeybindingItemMatches(
                 this.modifierLabels,
                 keybindingItem,
                 searchValue,
                 words,
                 keybindingWords,
                 completeMatch
-            ));
+            )));
             if (keybindingMatches.commandIdMatches
                 || keybindingMatches.commandLabelMatches
                 || keybindingMatches.commandDefaultLabelMatches
@@ -152,22 +145,22 @@ let KeybindingsEditorModel = KeybindingsEditorModel_1 = class KeybindingsEditorM
         }
         return result;
     }
-    async resolve(actionLabels = ( new Map())) {
-        const extensions = ( new ExtensionIdentifierMap());
+    async resolve(actionLabels = ( (new Map()))) {
+        const extensions = ( (new ExtensionIdentifierMap()));
         for (const extension of this.extensionService.extensions) {
             extensions.set(extension.identifier, extension);
         }
         this._keybindingItemsSortedByPrecedence = [];
-        const boundCommands = ( new Map());
+        const boundCommands = ( (new Map()));
         for (const keybinding of this.keybindingsService.getKeybindings()) {
             if (keybinding.command) {
                 this._keybindingItemsSortedByPrecedence.push(KeybindingsEditorModel_1.toKeybindingEntry(keybinding.command, keybinding, actionLabels, extensions));
                 boundCommands.set(keybinding.command, true);
             }
         }
-        const commandsWithDefaultKeybindings = ( this.keybindingsService.getDefaultKeybindings().map(keybinding => keybinding.command));
+        const commandsWithDefaultKeybindings = ( (this.keybindingsService.getDefaultKeybindings().map(keybinding => keybinding.command)));
         for (const command of getAllUnboundCommands(boundCommands)) {
-            const keybindingItem = ( new ResolvedKeybindingItem(
+            const keybindingItem = ( (new ResolvedKeybindingItem(
                 undefined,
                 command,
                 null,
@@ -175,7 +168,7 @@ let KeybindingsEditorModel = KeybindingsEditorModel_1 = class KeybindingsEditorM
                 commandsWithDefaultKeybindings.indexOf(command) === -1,
                 null,
                 false
-            ));
+            )));
             this._keybindingItemsSortedByPrecedence.push(KeybindingsEditorModel_1.toKeybindingEntry(command, keybindingItem, actionLabels, extensions));
         }
         this._keybindingItemsSortedByPrecedence = distinct(this._keybindingItemsSortedByPrecedence, keybindingItem => KeybindingsEditorModel_1.getId(keybindingItem));
@@ -231,13 +224,7 @@ let KeybindingsEditorModel = KeybindingsEditorModel_1 = class KeybindingsEditorM
             if (menuCommand && menuCommand.title && menuCommand.title.original) {
                 const category = menuCommand.category ? menuCommand.category.original : undefined;
                 const title = menuCommand.title.original;
-                return category ? ( localizeWithPath(
-                    'vs/workbench/services/preferences/browser/keybindingsEditorModel',
-                    'cat.title',
-                    "{0}: {1}",
-                    category,
-                    title
-                )) : title;
+                return category ? ( localizeWithPath(_moduleId, 3, "{0}: {1}", category, title)) : title;
             }
         }
         return null;
@@ -246,13 +233,7 @@ let KeybindingsEditorModel = KeybindingsEditorModel_1 = class KeybindingsEditorM
         if (menuCommand) {
             const category = menuCommand.category ? typeof menuCommand.category === 'string' ? menuCommand.category : menuCommand.category.value : undefined;
             const title = typeof menuCommand.title === 'string' ? menuCommand.title : menuCommand.title.value;
-            return category ? ( localizeWithPath(
-                'vs/workbench/services/preferences/browser/keybindingsEditorModel',
-                'cat.title',
-                "{0}: {1}",
-                category,
-                title
-            )) : title;
+            return category ? ( localizeWithPath(_moduleId, 3, "{0}: {1}", category, title)) : title;
         }
         if (editorActionLabel) {
             return editorActionLabel;
@@ -260,10 +241,10 @@ let KeybindingsEditorModel = KeybindingsEditorModel_1 = class KeybindingsEditorM
         return '';
     }
 };
-KeybindingsEditorModel = KeybindingsEditorModel_1 = ( __decorate([
-    ( __param(1, IKeybindingService)),
-    ( __param(2, IExtensionService))
-], KeybindingsEditorModel));
+KeybindingsEditorModel = KeybindingsEditorModel_1 = ( (__decorate([
+    ( (__param(1, IKeybindingService))),
+    ( (__param(2, IExtensionService)))
+], KeybindingsEditorModel)));
 class KeybindingItemMatches {
     constructor(modifierLabels, keybindingItem, searchValue, words, keybindingWords, completeMatch) {
         this.modifierLabels = modifierLabels;
@@ -314,9 +295,9 @@ class KeybindingItemMatches {
         return matches;
     }
     filterAndSort(matches) {
-        return distinct(matches, (a => a.start + '.' + a.end)).filter(match => !( matches.some(
+        return distinct(matches, (a => a.start + '.' + a.end)).filter(match => !( (matches.some(
             m => !(m.start === match.start && m.end === match.end) && (m.start <= match.start && m.end >= match.end)
-        ))).sort((a, b) => a.start - b.start);
+        )))).sort((a, b) => a.start - b.start);
     }
     matchesKeybinding(keybinding, searchValue, words, completeMatch) {
         const [firstPart, chordPart] = keybinding.getChords();
@@ -532,11 +513,7 @@ class KeybindingItemMatches {
         if (equalsIgnoreCase(this.modifierLabels.user.altKey, word)) {
             return true;
         }
-        if (equalsIgnoreCase(( localizeWithPath(
-            'vs/workbench/services/preferences/browser/keybindingsEditorModel',
-            'option',
-            "option"
-        )), word)) {
+        if (equalsIgnoreCase(( localizeWithPath(_moduleId, 4, "option")), word)) {
             return true;
         }
         return false;
@@ -563,11 +540,7 @@ class KeybindingItemMatches {
         if (equalsIgnoreCase(this.modifierLabels.user.metaKey, word)) {
             return true;
         }
-        if (equalsIgnoreCase(( localizeWithPath(
-            'vs/workbench/services/preferences/browser/keybindingsEditorModel',
-            'meta',
-            "meta"
-        )), word)) {
+        if (equalsIgnoreCase(( localizeWithPath(_moduleId, 5, "meta")), word)) {
             return true;
         }
         return false;

package/vscode/src/vs/workbench/services/preferences/common/preferencesEditorInput.js

@@ -7,20 +7,17 @@ import { registerIcon } from '../../../../platform/theme/common/iconRegistry.js'
 import { EditorInput } from '../../../common/editor/editorInput.js';
 import { IPreferencesService } from './preferences.service.js';
 var SettingsEditor2Input_1;
-const SettingsEditorIcon = registerIcon('settings-editor-label-icon', Codicon.settings, ( localizeWithPath(
-    'vs/workbench/services/preferences/common/preferencesEditorInput',
-    'settingsEditorLabelIcon',
-    'Icon of the settings editor label.'
-)));
+const _moduleId = "vs/workbench/services/preferences/common/preferencesEditorInput";
+const SettingsEditorIcon = registerIcon('settings-editor-label-icon', Codicon.settings, ( localizeWithPath(_moduleId, 0, 'Icon of the settings editor label.')));
 let SettingsEditor2Input = class SettingsEditor2Input extends EditorInput {
     static { SettingsEditor2Input_1 = this; }
     static { this.ID = 'workbench.input.settings2'; }
     constructor(_preferencesService) {
         super();
-        this.resource = ( URI.from({
+        this.resource = ( (URI.from({
             scheme: Schemas.vscodeSettings,
             path: `settingseditor`
-        }));
+        })));
         this._settingsModel = _preferencesService.createSettings2EditorModel();
     }
     matches(otherInput) {
@@ -30,11 +27,7 @@ let SettingsEditor2Input = class SettingsEditor2Input extends EditorInput {
         return SettingsEditor2Input_1.ID;
     }
     getName() {
-        return ( localizeWithPath(
-            'vs/workbench/services/preferences/common/preferencesEditorInput',
-            'settingsEditor2InputName',
-            "Settings"
-        ));
+        return ( localizeWithPath(_moduleId, 1, "Settings"));
     }
     getIcon() {
         return SettingsEditorIcon;
@@ -47,7 +40,7 @@ let SettingsEditor2Input = class SettingsEditor2Input extends EditorInput {
         super.dispose();
     }
 };
-SettingsEditor2Input = SettingsEditor2Input_1 = ( __decorate([
-    ( __param(0, IPreferencesService))
-], SettingsEditor2Input));
+SettingsEditor2Input = SettingsEditor2Input_1 = ( (__decorate([
+    ( (__param(0, IPreferencesService)))
+], SettingsEditor2Input)));
 export { SettingsEditor2Input };

package/vscode/src/vs/workbench/services/preferences/common/preferencesModels.js

@@ -14,12 +14,13 @@ import { EditorModel } from '../../../common/editor/editorModel.js';
 import { SettingMatchType } from './preferences.js';
 import { FOLDER_SCOPES, WORKSPACE_SCOPES } from '../../configuration/common/configuration.js';
 import { createValidator } from './preferencesValidation.js';
+const _moduleId = "vs/workbench/services/preferences/common/preferencesModels";
 const nullRange = { startLineNumber: -1, startColumn: -1, endLineNumber: -1, endColumn: -1 };
 function isNullRange(range) { return range.startLineNumber === -1 && range.startColumn === -1 && range.endLineNumber === -1 && range.endColumn === -1; }
 class AbstractSettingsModel extends EditorModel {
     constructor() {
         super(...arguments);
-        this._currentResultGroups = ( new Map());
+        this._currentResultGroups = ( (new Map()));
     }
     updateResultGroup(id, resultGroup) {
         if (resultGroup) {
@@ -32,12 +33,12 @@ class AbstractSettingsModel extends EditorModel {
         return this.update();
     }
     removeDuplicateResults() {
-        const settingKeys = ( new Set());
-        [...( this._currentResultGroups.keys())]
+        const settingKeys = ( (new Set()));
+        [...( (this._currentResultGroups.keys()))]
             .sort((a, b) => this._currentResultGroups.get(a).order - this._currentResultGroups.get(b).order)
             .forEach(groupId => {
             const group = this._currentResultGroups.get(groupId);
-            group.result.filterMatches = group.result.filterMatches.filter(s => !( settingKeys.has(s.setting.key)));
+            group.result.filterMatches = group.result.filterMatches.filter(s => !( (settingKeys.has(s.setting.key))));
             group.result.filterMatches.forEach(s => settingKeys.add(s.setting.key));
         });
     }
@@ -93,7 +94,7 @@ class SettingsEditorModel extends AbstractSettingsModel {
     constructor(reference, _configurationTarget) {
         super();
         this._configurationTarget = _configurationTarget;
-        this._onDidChangeGroups = this._register(( new Emitter()));
+        this._onDidChangeGroups = this._register(( (new Emitter())));
         this.onDidChangeGroups = this._onDidChangeGroups.event;
         this.settingsModel = reference.object.textEditorModel;
         this._register(this.onWillDispose(() => reference.dispose()));
@@ -118,7 +119,9 @@ class SettingsEditorModel extends AbstractSettingsModel {
         return this.settingsModel.getValue();
     }
     findValueMatches(filter, setting) {
-        return ( this.settingsModel.findMatches(filter, setting.valueRange, false, false, null, false).map(match => match.range));
+        return (
+             (this.settingsModel.findMatches(filter, setting.valueRange, false, false, null, false).map(match => match.range))
+        );
     }
     isSettingsProperty(property, previousParents) {
         return previousParents.length === 0;
@@ -127,7 +130,7 @@ class SettingsEditorModel extends AbstractSettingsModel {
         this._settingsGroups = parse(this.settingsModel, (property, previousParents) => this.isSettingsProperty(property, previousParents));
     }
     update() {
-        const resultGroups = [...( this._currentResultGroups.values())];
+        const resultGroups = [...( (this._currentResultGroups.values()))];
         if (!resultGroups.length) {
             return undefined;
         }
@@ -169,7 +172,7 @@ let Settings2EditorModel = class Settings2EditorModel extends AbstractSettingsMo
     constructor(_defaultSettings, configurationService) {
         super();
         this._defaultSettings = _defaultSettings;
-        this._onDidChangeGroups = this._register(( new Emitter()));
+        this._onDidChangeGroups = this._register(( (new Emitter())));
         this.onDidChangeGroups = this._onDidChangeGroups.event;
         this.dirty = false;
         this._register(configurationService.onDidChangeConfiguration(e => {
@@ -178,7 +181,7 @@ let Settings2EditorModel = class Settings2EditorModel extends AbstractSettingsMo
                 this._onDidChangeGroups.fire();
             }
         }));
-        this._register(( Registry.as(Extensions.Configuration)).onDidSchemaChange(e => {
+        this._register(( (Registry.as(Extensions.Configuration))).onDidSchemaChange(e => {
             this.dirty = true;
             this._onDidChangeGroups.fire();
         }));
@@ -201,12 +204,12 @@ let Settings2EditorModel = class Settings2EditorModel extends AbstractSettingsMo
         return [];
     }
     update() {
-        throw new Error('Not supported');
+        throw ( (new Error('Not supported')));
     }
 };
-Settings2EditorModel = ( __decorate([
-    ( __param(1, IConfigurationService))
-], Settings2EditorModel));
+Settings2EditorModel = ( (__decorate([
+    ( (__param(1, IConfigurationService)))
+], Settings2EditorModel)));
 function parse(model, isSettingsProperty) {
     const settings = [];
     let overrideSetting = null;
@@ -390,8 +393,8 @@ class DefaultSettings extends Disposable {
         super();
         this._mostCommonlyUsedSettingsKeys = _mostCommonlyUsedSettingsKeys;
         this.target = target;
-        this._settingsByName = ( new Map());
-        this._onDidChange = this._register(( new Emitter()));
+        this._settingsByName = ( (new Map()));
+        this._onDidChange = this._register(( (new Emitter())));
         this.onDidChange = this._onDidChange.event;
     }
     getContent(forceUpdate = false) {
@@ -424,7 +427,7 @@ class DefaultSettings extends Disposable {
         return [mostCommonlyUsed, ...settingsGroups];
     }
     getRegisteredGroups() {
-        const configurations = ( Registry.as(Extensions.Configuration)).getConfigurations().slice();
+        const configurations = ( (Registry.as(Extensions.Configuration))).getConfigurations().slice();
         const groups = this.removeEmptySettingsGroups(configurations.sort(this.compareConfigurationNodes)
             .reduce((result, config, index, array) => this.parseConfig(config, result, array), []));
         return this.sortGroups(groups);
@@ -438,7 +441,7 @@ class DefaultSettings extends Disposable {
         return groups;
     }
     initAllSettingsMap(allSettingsGroups) {
-        this._settingsByName = ( new Map());
+        this._settingsByName = ( (new Map()));
         for (const group of allSettingsGroups) {
             for (const section of group.sections) {
                 for (const setting of section.settings) {
@@ -448,7 +451,7 @@ class DefaultSettings extends Disposable {
         }
     }
     getMostCommonlyUsedSettings(allSettingsGroups) {
-        const settings = coalesce(( this._mostCommonlyUsedSettingsKeys.map(key => {
+        const settings = coalesce(( (this._mostCommonlyUsedSettingsKeys.map(key => {
             const setting = this._settingsByName.get(key);
             if (setting) {
                 return {
@@ -467,15 +470,11 @@ class DefaultSettings extends Disposable {
                 };
             }
             return null;
-        })));
+        }))));
         return {
             id: 'mostCommonlyUsed',
             range: nullRange,
-            title: ( localizeWithPath(
-                'vs/workbench/services/preferences/common/preferencesModels',
-                'commonlyUsed',
-                "Commonly Used"
-            )),
+            title: ( localizeWithPath(_moduleId, 0, "Commonly Used")),
             titleRange: nullRange,
             sections: [
                 {
@@ -570,8 +569,8 @@ class DefaultSettings extends Disposable {
                     enumDescriptionsAreMarkdown = !!prop.items.markdownEnumDescriptions;
                 }
                 let allKeysAreBoolean = false;
-                if (prop.type === 'object' && !prop.additionalProperties && prop.properties && ( Object.keys(prop.properties)).length) {
-                    allKeysAreBoolean = ( Object.keys(prop.properties)).every(key => {
+                if (prop.type === 'object' && !prop.additionalProperties && prop.properties && ( (Object.keys(prop.properties))).length) {
+                    allKeysAreBoolean = ( (Object.keys(prop.properties))).every(key => {
                         return prop.properties[key].type === 'boolean';
                     });
                 }
@@ -629,17 +628,19 @@ class DefaultSettings extends Disposable {
         return result;
     }
     parseOverrideSettings(overrideSettings) {
-        return ( ( Object.keys(overrideSettings)).map((key) => ({
-            key,
-            value: overrideSettings[key],
-            description: [],
-            descriptionIsMarkdown: false,
-            range: nullRange,
-            keyRange: nullRange,
-            valueRange: nullRange,
-            descriptionRanges: [],
-            overrides: []
-        })));
+        return (
+             (( (Object.keys(overrideSettings))).map((key) => ({
+                key,
+                value: overrideSettings[key],
+                description: [],
+                descriptionIsMarkdown: false,
+                range: nullRange,
+                keyRange: nullRange,
+                valueRange: nullRange,
+                descriptionRanges: [],
+                overrides: []
+            })))
+        );
     }
     matchesScope(property) {
         if (!property.scope) {
@@ -668,7 +669,7 @@ class DefaultSettings extends Disposable {
         return c1.order - c2.order;
     }
     toContent(settingsGroups, startIndex) {
-        const builder = ( new SettingsContentBuilder());
+        const builder = ( (new SettingsContentBuilder()));
         for (let i = startIndex; i < settingsGroups.length; i++) {
             builder.pushGroup(settingsGroups[i], i === startIndex, i === settingsGroups.length - 1);
         }
@@ -680,7 +681,7 @@ class DefaultSettingsEditorModel extends AbstractSettingsModel {
         super();
         this._uri = _uri;
         this.defaultSettings = defaultSettings;
-        this._onDidChangeGroups = this._register(( new Emitter()));
+        this._onDidChangeGroups = this._register(( (new Emitter())));
         this.onDidChangeGroups = this._onDidChangeGroups.event;
         this._register(defaultSettings.onDidChange(() => this._onDidChangeGroups.fire()));
         this._model = reference.object.textEditorModel;
@@ -702,7 +703,7 @@ class DefaultSettingsEditorModel extends AbstractSettingsModel {
         if (this._model.isDisposed()) {
             return undefined;
         }
-        const resultGroups = [...( this._currentResultGroups.values())]
+        const resultGroups = [...( (this._currentResultGroups.values()))]
             .sort((a, b) => a.order - b.order);
         const nonEmptyResultGroups = resultGroups.filter(group => group.result.filterMatches.length);
         const startLine = tail(this.settingsGroups).range.endLineNumber + 2;
@@ -719,7 +720,7 @@ class DefaultSettingsEditorModel extends AbstractSettingsModel {
     }
     writeResultGroups(groups, startLine) {
         const contentBuilderOffset = startLine - 1;
-        const builder = ( new SettingsContentBuilder(contentBuilderOffset));
+        const builder = ( (new SettingsContentBuilder(contentBuilderOffset)));
         const settingsGroups = [];
         const matches = [];
         if (groups.length) {
@@ -732,11 +733,11 @@ class DefaultSettingsEditorModel extends AbstractSettingsModel {
         }
         const groupContent = builder.getContent() + '\n';
         const groupEndLine = this._model.getLineCount();
-        const cursorPosition = ( new Selection(startLine, 1, startLine, 1));
+        const cursorPosition = ( (new Selection(startLine, 1, startLine, 1)));
         const edit = {
             text: groupContent,
             forceMoveMarkers: true,
-            range: ( new Range(startLine, 1, groupEndLine, 1))
+            range: ( (new Range(startLine, 1, groupEndLine, 1)))
         };
         this._model.pushEditOperations([cursorPosition], [edit], () => [cursorPosition]);
         const tokenizeTo = Math.min(startLine + 60, this._model.getLineCount());
@@ -744,35 +745,41 @@ class DefaultSettingsEditorModel extends AbstractSettingsModel {
         return { matches, settingsGroups };
     }
     writeSettingsGroupToBuilder(builder, settingsGroup, filterMatches) {
-        filterMatches = ( filterMatches
+        filterMatches = ( (filterMatches
             .map(filteredMatch => {
             return {
                 setting: filteredMatch.setting,
                 score: filteredMatch.score,
-                matches: filteredMatch.matches && ( filteredMatch.matches.map(match => {
-                    return ( new Range(
-                        match.startLineNumber - filteredMatch.setting.range.startLineNumber,
-                        match.startColumn,
-                        match.endLineNumber - filteredMatch.setting.range.startLineNumber,
-                        match.endColumn
-                    ));
-                }))
+                matches: filteredMatch.matches && ( (filteredMatch.matches.map(match => {
+                    return (
+                         (new Range(
+                            match.startLineNumber - filteredMatch.setting.range.startLineNumber,
+                            match.startColumn,
+                            match.endLineNumber - filteredMatch.setting.range.startLineNumber,
+                            match.endColumn
+                        ))
+                    );
+                })))
             };
-        }));
+        })));
         builder.pushGroup(settingsGroup);
-        const fixedMatches = flatten(( ( filterMatches
-            .map(m => m.matches || []))
+        const fixedMatches = flatten(( (( (filterMatches
+            .map(m => m.matches || [])))
             .map((settingMatches, i) => {
             const setting = settingsGroup.sections[0].settings[i];
-            return ( settingMatches.map(range => {
-                return ( new Range(
-                    range.startLineNumber + setting.range.startLineNumber,
-                    range.startColumn,
-                    range.endLineNumber + setting.range.startLineNumber,
-                    range.endColumn
-                ));
-            }));
-        })));
+            return (
+                 (settingMatches.map(range => {
+                    return (
+                         (new Range(
+                            range.startLineNumber + setting.range.startLineNumber,
+                            range.startColumn,
+                            range.endLineNumber + setting.range.startLineNumber,
+                            range.endColumn
+                        ))
+                    );
+                }))
+            );
+        }))));
         return fixedMatches;
     }
     copySetting(setting) {
@@ -818,7 +825,7 @@ class DefaultSettingsEditorModel extends AbstractSettingsModel {
             titleRange: nullRange,
             sections: [
                 {
-                    settings: ( resultGroup.result.filterMatches.map(m => this.copySetting(m.setting)))
+                    settings: ( (resultGroup.result.filterMatches.map(m => this.copySetting(m.setting))))
                 }
             ]
         };
@@ -903,7 +910,7 @@ class SettingsContentBuilder {
                     displayEnum;
                 const lines = line.split(/\n/g);
                 lines[0] = ' - ' + lines[0];
-                this._contentByLines.push(...( lines.map(l => `${indent}// ${l}`)));
+                this._contentByLines.push(...( (lines.map(l => `${indent}// ${l}`))));
                 setting.descriptionRanges.push({ startLineNumber: this.lineCountWithOffset, startColumn: this.lastLine.indexOf(line) + 1, endLineNumber: this.lineCountWithOffset, endColumn: this.lastLine.length });
             });
         }
@@ -958,7 +965,7 @@ class DefaultRawSettingsEditorModel extends Disposable {
     }
     get content() {
         if (this._content === null) {
-            const builder = ( new RawSettingsContentBuilder());
+            const builder = ( (new RawSettingsContentBuilder()));
             builder.pushLine('{');
             for (const settingsGroup of this.defaultSettings.getRegisteredGroups()) {
                 builder.pushGroup(settingsGroup);
@@ -976,8 +983,8 @@ function escapeInvisibleChars(enumValue) {
 }
 function defaultKeybindingsContents(keybindingService) {
     const defaultsHeader = '// ' + ( localizeWithPath(
-        'vs/workbench/services/preferences/common/preferencesModels',
-        'defaultKeybindingsHeader',
+        _moduleId,
+        1,
         "Override key bindings by placing them into your key bindings file."
     ));
     return defaultsHeader + '\n' + keybindingService.getDefaultKeybindingsContent();
@@ -1002,7 +1009,7 @@ let DefaultKeybindingsEditorModel = class DefaultKeybindingsEditorModel {
     dispose() {
     }
 };
-DefaultKeybindingsEditorModel = ( __decorate([
-    ( __param(1, IKeybindingService))
-], DefaultKeybindingsEditorModel));
+DefaultKeybindingsEditorModel = ( (__decorate([
+    ( (__param(1, IKeybindingService)))
+], DefaultKeybindingsEditorModel)));
 export { DefaultKeybindingsEditorModel, DefaultRawSettingsEditorModel, DefaultSettings, DefaultSettingsEditorModel, Settings2EditorModel, SettingsEditorModel, WorkspaceConfigurationEditorModel, defaultKeybindingsContents, nullRange };