@codingame/monaco-vscode-api 5.2.0 → 6.0.0

package/vscode/src/vs/editor/contrib/find/browser/findModel.js

@@ -1,10 +1,16 @@
 import { findFirstIdxMonotonousOrArrLen } from '../../../../base/common/arraysFind.js';
 import { TimeoutTimer, RunOnceScheduler } from '../../../../base/common/async.js';
+import { KeyMod as KeyMod$1, KeyCode } from '../../../../base/common/keyCodes.js';
 import { DisposableStore, dispose } from '../../../../base/common/lifecycle.js';
+import { Constants } from '../../../../base/common/uint.js';
 import { ReplaceCommandThatPreservesSelection, ReplaceCommand } from '../../../common/commands/replaceCommand.js';
+import { EditorOption } from '../../../common/config/editorOptions.js';
+import { CursorChangeReason } from '../../../common/cursorEvents.js';
 import { Position } from '../../../common/core/position.js';
 import { Range } from '../../../common/core/range.js';
 import { Selection } from '../../../common/core/selection.js';
+import { ScrollType } from '../../../common/editorCommon.js';
+import { EndOfLinePreference } from '../../../common/model.js';
 import { SearchParams } from '../../../common/model/textModelSearch.js';
 import { FindDecorations } from './findDecorations.js';
 import { ReplaceAllCommand } from './replaceAllCommand.js';
@@ -15,24 +21,24 @@ const CONTEXT_FIND_WIDGET_NOT_VISIBLE = ( CONTEXT_FIND_WIDGET_VISIBLE.toNegated(
 const CONTEXT_FIND_INPUT_FOCUSED = ( new RawContextKey('findInputFocussed', false));
 const CONTEXT_REPLACE_INPUT_FOCUSED = ( new RawContextKey('replaceInputFocussed', false));
 const ToggleCaseSensitiveKeybinding = {
-    primary: 512  | 33 ,
-    mac: { primary: 2048  | 512  | 33  }
+    primary: KeyMod$1.Alt | KeyCode.KeyC,
+    mac: { primary: KeyMod$1.CtrlCmd | KeyMod$1.Alt | KeyCode.KeyC }
 };
 const ToggleWholeWordKeybinding = {
-    primary: 512  | 53 ,
-    mac: { primary: 2048  | 512  | 53  }
+    primary: KeyMod$1.Alt | KeyCode.KeyW,
+    mac: { primary: KeyMod$1.CtrlCmd | KeyMod$1.Alt | KeyCode.KeyW }
 };
 const ToggleRegexKeybinding = {
-    primary: 512  | 48 ,
-    mac: { primary: 2048  | 512  | 48  }
+    primary: KeyMod$1.Alt | KeyCode.KeyR,
+    mac: { primary: KeyMod$1.CtrlCmd | KeyMod$1.Alt | KeyCode.KeyR }
 };
 const ToggleSearchScopeKeybinding = {
-    primary: 512  | 42 ,
-    mac: { primary: 2048  | 512  | 42  }
+    primary: KeyMod$1.Alt | KeyCode.KeyL,
+    mac: { primary: KeyMod$1.CtrlCmd | KeyMod$1.Alt | KeyCode.KeyL }
 };
 const TogglePreserveCaseKeybinding = {
-    primary: 512  | 46 ,
-    mac: { primary: 2048  | 512  | 46  }
+    primary: KeyMod$1.Alt | KeyCode.KeyP,
+    mac: { primary: KeyMod$1.CtrlCmd | KeyMod$1.Alt | KeyCode.KeyP }
 };
 const FIND_IDS = {
     StartFindAction: 'actions.find',
@@ -68,9 +74,9 @@ class FindModelBoundToEditorModel {
         this._updateDecorationsScheduler = ( new RunOnceScheduler(() => this.research(false), 100));
         this._toDispose.add(this._updateDecorationsScheduler);
         this._toDispose.add(this._editor.onDidChangeCursorPosition((e) => {
-            if (e.reason === 3
-                || e.reason === 5
-                || e.reason === 6 ) {
+            if (e.reason === CursorChangeReason.Explicit
+                || e.reason === CursorChangeReason.Undo
+                || e.reason === CursorChangeReason.Redo) {
                 this._decorations.setStartPosition(this._editor.getPosition());
             }
         }));
@@ -170,7 +176,7 @@ class FindModelBoundToEditorModel {
             currentMatchesPosition = matchAfterSelection > 0 ? matchAfterSelection - 1 + 1  : currentMatchesPosition;
         }
         this._state.changeMatchInfo(currentMatchesPosition, this._decorations.getCount(), undefined);
-        if (moveCursor && this._editor.getOption(41 ).cursorMoveOnType) {
+        if (moveCursor && this._editor.getOption(EditorOption.find).cursorMoveOnType) {
             this._moveToNextMatch(this._decorations.getStartPosition());
         }
     }
@@ -181,7 +187,7 @@ class FindModelBoundToEditorModel {
         if (!this._hasMatches()) {
             const findScope = this._decorations.getFindScope();
             if (findScope) {
-                this._editor.revealRangeInCenterIfOutsideViewport(findScope, 0 );
+                this._editor.revealRangeInCenterIfOutsideViewport(findScope, ScrollType.Smooth);
             }
             return true;
         }
@@ -191,7 +197,7 @@ class FindModelBoundToEditorModel {
         const matchesPosition = this._decorations.setCurrentFindMatch(match);
         this._state.changeMatchInfo(matchesPosition, this._decorations.getCount(), match);
         this._editor.setSelection(match);
-        this._editor.revealRangeInCenterIfOutsideViewport(match, 0 );
+        this._editor.revealRangeInCenterIfOutsideViewport(match, ScrollType.Smooth);
     }
     _prevSearchPosition(before) {
         const isUsingLineStops = this._state.isRegex && (this._state.searchString.indexOf('^') >= 0
@@ -245,10 +251,10 @@ class FindModelBoundToEditorModel {
         const { lineNumber, column } = before;
         const model = this._editor.getModel();
         let position = ( new Position(lineNumber, column));
-        let prevMatch = model.findPreviousMatch(this._state.searchString, position, this._state.isRegex, this._state.matchCase, this._state.wholeWord ? this._editor.getOption(131 ) : null, false);
+        let prevMatch = model.findPreviousMatch(this._state.searchString, position, this._state.isRegex, this._state.matchCase, this._state.wholeWord ? this._editor.getOption(EditorOption.wordSeparators) : null, false);
         if (prevMatch && prevMatch.range.isEmpty() && prevMatch.range.getStartPosition().equals(position)) {
             position = this._prevSearchPosition(position);
-            prevMatch = model.findPreviousMatch(this._state.searchString, position, this._state.isRegex, this._state.matchCase, this._state.wholeWord ? this._editor.getOption(131 ) : null, false);
+            prevMatch = model.findPreviousMatch(this._state.searchString, position, this._state.isRegex, this._state.matchCase, this._state.wholeWord ? this._editor.getOption(EditorOption.wordSeparators) : null, false);
         }
         if (!prevMatch) {
             return;
@@ -319,10 +325,10 @@ class FindModelBoundToEditorModel {
         const { lineNumber, column } = after;
         const model = this._editor.getModel();
         let position = ( new Position(lineNumber, column));
-        let nextMatch = model.findNextMatch(this._state.searchString, position, this._state.isRegex, this._state.matchCase, this._state.wholeWord ? this._editor.getOption(131 ) : null, captureMatches);
+        let nextMatch = model.findNextMatch(this._state.searchString, position, this._state.isRegex, this._state.matchCase, this._state.wholeWord ? this._editor.getOption(EditorOption.wordSeparators) : null, captureMatches);
         if (forceMove && nextMatch && nextMatch.range.isEmpty() && nextMatch.range.getStartPosition().equals(position)) {
             position = this._nextSearchPosition(position);
-            nextMatch = model.findNextMatch(this._state.searchString, position, this._state.isRegex, this._state.matchCase, this._state.wholeWord ? this._editor.getOption(131 ) : null, captureMatches);
+            nextMatch = model.findNextMatch(this._state.searchString, position, this._state.isRegex, this._state.matchCase, this._state.wholeWord ? this._editor.getOption(EditorOption.wordSeparators) : null, captureMatches);
         }
         if (!nextMatch) {
             return null;
@@ -375,7 +381,7 @@ class FindModelBoundToEditorModel {
         const searchRanges = ( (findScopes || [null]).map(
             (scope) => FindModelBoundToEditorModel._getSearchRange(this._editor.getModel(), scope)
         ));
-        return this._editor.getModel().findMatches(this._state.searchString, searchRanges, this._state.isRegex, this._state.matchCase, this._state.wholeWord ? this._editor.getOption(131 ) : null, captureMatches, limitResultCount);
+        return this._editor.getModel().findMatches(this._state.searchString, searchRanges, this._state.isRegex, this._state.matchCase, this._state.wholeWord ? this._editor.getOption(EditorOption.wordSeparators) : null, captureMatches, limitResultCount);
     }
     replaceAll() {
         if (!this._hasMatches()) {
@@ -395,7 +401,7 @@ class FindModelBoundToEditorModel {
             this._state.searchString,
             this._state.isRegex,
             this._state.matchCase,
-            this._state.wholeWord ? this._editor.getOption(131 ) : null
+            this._state.wholeWord ? this._editor.getOption(EditorOption.wordSeparators) : null
         ));
         const searchData = searchParams.parseSearchRequest();
         if (!searchData) {
@@ -413,7 +419,7 @@ class FindModelBoundToEditorModel {
             searchRegex = ( new RegExp(searchRegex.source, mod));
         }
         const model = this._editor.getModel();
-        const modelText = model.getValue(1 );
+        const modelText = model.getValue(EndOfLinePreference.LF);
         const fullModelRange = model.getFullModelRange();
         const replacePattern = this._getReplacePattern();
         let resultText;
@@ -431,7 +437,7 @@ class FindModelBoundToEditorModel {
     }
     _regularReplaceAll(findScopes) {
         const replacePattern = this._getReplacePattern();
-        const matches = this._findMatches(findScopes, replacePattern.hasReplacementPatterns || this._state.preserveCase, 1073741824 );
+        const matches = this._findMatches(findScopes, replacePattern.hasReplacementPatterns || this._state.preserveCase, Constants.MAX_SAFE_SMALL_INTEGER);
         const replaceStrings = [];
         for (let i = 0, len = matches.length; i < len; i++) {
             replaceStrings[i] = replacePattern.buildReplaceString(matches[i].matches, this._state.preserveCase);
@@ -444,7 +450,7 @@ class FindModelBoundToEditorModel {
             return;
         }
         const findScopes = this._decorations.getFindScopes();
-        const matches = this._findMatches(findScopes, false, 1073741824 );
+        const matches = this._findMatches(findScopes, false, Constants.MAX_SAFE_SMALL_INTEGER);
         let selections = ( matches.map(m => ( new Selection(
             m.range.startLineNumber,
             m.range.startColumn,

package/vscode/src/vs/editor/contrib/find/browser/findOptionsWidget.js

@@ -3,6 +3,7 @@ import './findOptionsWidget.css.js';
 import { CaseSensitiveToggle, WholeWordsToggle, RegexToggle } from '../../../../base/browser/ui/findinput/findInputToggles.js';
 import { Widget } from '../../../../base/browser/ui/widget.js';
 import { RunOnceScheduler } from '../../../../base/common/async.js';
+import { OverlayWidgetPositionPreference } from '../../../browser/editorBrowser.js';
 import { FIND_IDS } from './findModel.js';
 import { asCssVariable } from '../../../../platform/theme/common/colorUtils.js';
 import '../../../../platform/theme/common/colors/baseColors.js';
@@ -115,7 +116,7 @@ class FindOptionsWidget extends Widget {
     }
     getPosition() {
         return {
-            preference: 0
+            preference: OverlayWidgetPositionPreference.TOP_RIGHT_CORNER
         };
     }
     highlightFindOptions() {

package/vscode/src/vs/editor/contrib/find/browser/findState.js

@@ -2,11 +2,17 @@ import { Emitter } from '../../../../base/common/event.js';
 import { Disposable } from '../../../../base/common/lifecycle.js';
 import { Range } from '../../../common/core/range.js';
 import { MATCHES_LIMIT } from './findModel.js';
+var FindOptionOverride;
+( (function(FindOptionOverride) {
+    FindOptionOverride[FindOptionOverride["NotSet"] = 0] = "NotSet";
+    FindOptionOverride[FindOptionOverride["True"] = 1] = "True";
+    FindOptionOverride[FindOptionOverride["False"] = 2] = "False";
+})(FindOptionOverride || (FindOptionOverride = {})));
 function effectiveOptionValue(override, value) {
-    if (override === 1 ) {
+    if (override === FindOptionOverride.True) {
         return true;
     }
-    if (override === 2 ) {
+    if (override === FindOptionOverride.False) {
         return false;
     }
     return value;
@@ -39,13 +45,13 @@ class FindReplaceState extends Disposable {
         this._isRevealed = false;
         this._isReplaceRevealed = false;
         this._isRegex = false;
-        this._isRegexOverride = 0 ;
+        this._isRegexOverride = FindOptionOverride.NotSet;
         this._wholeWord = false;
-        this._wholeWordOverride = 0 ;
+        this._wholeWordOverride = FindOptionOverride.NotSet;
         this._matchCase = false;
-        this._matchCaseOverride = 0 ;
+        this._matchCaseOverride = FindOptionOverride.NotSet;
         this._preserveCase = false;
-        this._preserveCaseOverride = 0 ;
+        this._preserveCaseOverride = FindOptionOverride.NotSet;
         this._searchScope = null;
         this._matchesPosition = 0;
         this._matchesCount = 0;
@@ -202,10 +208,10 @@ class FindReplaceState extends Disposable {
             changeEvent.filters = true;
             somethingChanged = true;
         }
-        this._isRegexOverride = ((typeof newState.isRegexOverride !== 'undefined' ? newState.isRegexOverride : 0) );
-        this._wholeWordOverride = ((typeof newState.wholeWordOverride !== 'undefined' ? newState.wholeWordOverride : 0) );
-        this._matchCaseOverride = ((typeof newState.matchCaseOverride !== 'undefined' ? newState.matchCaseOverride : 0) );
-        this._preserveCaseOverride = ((typeof newState.preserveCaseOverride !== 'undefined' ? newState.preserveCaseOverride : 0) );
+        this._isRegexOverride = (typeof newState.isRegexOverride !== 'undefined' ? newState.isRegexOverride : FindOptionOverride.NotSet);
+        this._wholeWordOverride = (typeof newState.wholeWordOverride !== 'undefined' ? newState.wholeWordOverride : FindOptionOverride.NotSet);
+        this._matchCaseOverride = (typeof newState.matchCaseOverride !== 'undefined' ? newState.matchCaseOverride : FindOptionOverride.NotSet);
+        this._preserveCaseOverride = (typeof newState.preserveCaseOverride !== 'undefined' ? newState.preserveCaseOverride : FindOptionOverride.NotSet);
         if (oldEffectiveIsRegex !== this.isRegex) {
             somethingChanged = true;
             changeEvent.isRegex = true;
@@ -236,4 +242,4 @@ class FindReplaceState extends Disposable {
         return this._loop || (this.matchesCount >= MATCHES_LIMIT);
     }
 }
-export { FindReplaceState };
+export { FindOptionOverride, FindReplaceState };

package/vscode/src/vs/editor/contrib/find/browser/findWidget.js

@@ -1,24 +1,29 @@
 import { trackFocus, getTotalWidth, getDomNodePagePosition, getTopLeftOffset, getComputedStyle } from '../../../../base/browser/dom.js';
 import { alert } from '../../../../base/browser/ui/aria/aria.js';
 import { Toggle } from '../../../../base/browser/ui/toggle/toggle.js';
-import { Sash } from '../../../../base/browser/ui/sash/sash.js';
+import { Sash, Orientation } from '../../../../base/browser/ui/sash/sash.js';
 import { Widget } from '../../../../base/browser/ui/widget.js';
 import { Delayer } from '../../../../base/common/async.js';
 import { Codicon } from '../../../../base/common/codicons.js';
 import { onUnexpectedError } from '../../../../base/common/errors.js';
+import { KeyCode, KeyMod as KeyMod$1 } from '../../../../base/common/keyCodes.js';
 import { toDisposable } from '../../../../base/common/lifecycle.js';
 import { isWindows, isNative, isLinux, isMacintosh } from '../../../../base/common/platform.js';
 import { format } from '../../../../base/common/strings.js';
 import './findWidget.css.js';
+import { OverlayWidgetPositionPreference } from '../../../browser/editorBrowser.js';
+import { EditorOption } from '../../../common/config/editorOptions.js';
 import { Range } from '../../../common/core/range.js';
 import { CONTEXT_FIND_INPUT_FOCUSED, CONTEXT_REPLACE_INPUT_FOCUSED, MATCHES_LIMIT, FIND_IDS } from './findModel.js';
 import { localizeWithPath } from '../../../../nls.js';
+import { AccessibilitySupport } from '../../../../platform/accessibility/common/accessibility.js';
 import { ContextScopedFindInput, ContextScopedReplaceInput } from '../../../../platform/history/browser/contextScopedHistoryWidget.js';
 import { showHistoryKeybindingHint } from '../../../../platform/history/browser/historyWidgetKeybindingHint.js';
+import { StorageScope, StorageTarget } from '../../../../platform/storage/common/storage.js';
 import { asCssVariable } from '../../../../platform/theme/common/colorUtils.js';
 import { contrastBorder } from '../../../../platform/theme/common/colors/baseColors.js';
 import '../../../../platform/theme/common/colors/chartsColors.js';
-import { editorFindMatchHighlightBorder, editorFindRangeHighlightBorder } from '../../../../platform/theme/common/colors/editorColors.js';
+import { editorFindMatchHighlightBorder, editorFindRangeHighlightBorder, editorFindMatchForeground, editorFindMatchHighlightForeground } from '../../../../platform/theme/common/colors/editorColors.js';
 import { inputActiveOptionBackground, inputActiveOptionBorder, inputActiveOptionForeground } from '../../../../platform/theme/common/colors/inputColors.js';
 import '../../../../platform/theme/common/colors/listColors.js';
 import '../../../../platform/theme/common/colors/menuColors.js';
@@ -34,9 +39,9 @@ import { assertIsDefined } from '../../../../base/common/types.js';
 import { defaultInputBoxStyles, defaultToggleStyles } from '../../../../platform/theme/browser/defaultStyles.js';
 import { createInstantHoverDelegate, getDefaultHoverDelegate } from '../../../../base/browser/ui/hover/hoverDelegateFactory.js';
 const _moduleId = "vs/editor/contrib/find/browser/findWidget";
-const findSelectionIcon = registerIcon('find-selection', Codicon.selection, ( localizeWithPath(_moduleId, 0, 'Icon for \'Find in Selection\' in the editor find widget.')));
-const findCollapsedIcon = registerIcon('find-collapsed', Codicon.chevronRight, ( localizeWithPath(_moduleId, 1, 'Icon to indicate that the editor find widget is collapsed.')));
-const findExpandedIcon = registerIcon('find-expanded', Codicon.chevronDown, ( localizeWithPath(_moduleId, 2, 'Icon to indicate that the editor find widget is expanded.')));
+const findCollapsedIcon = registerIcon('find-collapsed', Codicon.chevronRight, ( localizeWithPath(_moduleId, 0, 'Icon to indicate that the editor find widget is collapsed.')));
+const findExpandedIcon = registerIcon('find-expanded', Codicon.chevronDown, ( localizeWithPath(_moduleId, 1, 'Icon to indicate that the editor find widget is expanded.')));
+const findSelectionIcon = registerIcon('find-selection', Codicon.selection, ( localizeWithPath(_moduleId, 2, 'Icon for \'Find in Selection\' in the editor find widget.')));
 const findReplaceIcon = registerIcon('find-replace', Codicon.replace, ( localizeWithPath(_moduleId, 3, 'Icon for \'Replace\' in the editor find widget.')));
 const findReplaceAllIcon = registerIcon('find-replace-all', Codicon.replaceAll, ( localizeWithPath(_moduleId, 4, 'Icon for \'Replace All\' in the editor find widget.')));
 const findPreviousMatchIcon = registerIcon('find-previous-match', Codicon.arrowUp, ( localizeWithPath(_moduleId, 5, 'Icon for \'Find Previous\' in the editor find widget.')));
@@ -67,7 +72,7 @@ const FIND_INPUT_AREA_WIDTH = PART_WIDTH - 54;
 let MAX_MATCHES_COUNT_WIDTH = 69;
 const FIND_INPUT_AREA_HEIGHT = 33;
 const ctrlEnterReplaceAllWarningPromptedKey = 'ctrlEnterReplaceAll.windows.donotask';
-const ctrlKeyMod = ((isMacintosh ? 256  : 2048) );
+const ctrlKeyMod = (isMacintosh ? KeyMod$1.WinCtrl : KeyMod$1.CtrlCmd);
 class FindWidgetViewZone {
     constructor(afterLineNumber) {
         this.afterLineNumber = afterLineNumber;
@@ -106,7 +111,7 @@ class FindWidget extends Widget {
         this._contextKeyService = contextKeyService;
         this._storageService = storageService;
         this._notificationService = notificationService;
-        this._ctrlEnterReplaceAllWarningPrompted = !!storageService.getBoolean(ctrlEnterReplaceAllWarningPromptedKey, 0 );
+        this._ctrlEnterReplaceAllWarningPrompted = !!storageService.getBoolean(ctrlEnterReplaceAllWarningPromptedKey, StorageScope.PROFILE);
         this._isVisible = false;
         this._isReplaceVisible = false;
         this._ignoreChangeEvent = false;
@@ -118,22 +123,22 @@ class FindWidget extends Widget {
         this._tryUpdateWidgetWidth();
         this._findInput.inputBox.layout();
         this._register(this._codeEditor.onDidChangeConfiguration((e) => {
-            if (e.hasChanged(91 )) {
-                if (this._codeEditor.getOption(91 )) {
+            if (e.hasChanged(EditorOption.readOnly)) {
+                if (this._codeEditor.getOption(EditorOption.readOnly)) {
                     this._state.change({ isReplaceRevealed: false }, false);
                 }
                 this._updateButtons();
             }
-            if (e.hasChanged(145 )) {
+            if (e.hasChanged(EditorOption.layoutInfo)) {
                 this._tryUpdateWidgetWidth();
             }
-            if (e.hasChanged(2 )) {
+            if (e.hasChanged(EditorOption.accessibilitySupport)) {
                 this.updateAccessibilitySupport();
             }
-            if (e.hasChanged(41 )) {
-                const supportLoop = this._codeEditor.getOption(41 ).loop;
+            if (e.hasChanged(EditorOption.find)) {
+                const supportLoop = this._codeEditor.getOption(EditorOption.find).loop;
                 this._state.change({ loop: supportLoop }, false);
-                const addExtraSpaceOnTop = this._codeEditor.getOption(41 ).addExtraSpaceOnTop;
+                const addExtraSpaceOnTop = this._codeEditor.getOption(EditorOption.find).addExtraSpaceOnTop;
                 if (addExtraSpaceOnTop && !this._viewZone) {
                     this._viewZone = ( (new FindWidgetViewZone(0)));
                     this._showViewZone();
@@ -177,7 +182,7 @@ class FindWidget extends Widget {
             this._replaceInputFocused.set(false);
         }));
         this._codeEditor.addOverlayWidget(this);
-        if (this._codeEditor.getOption(41 ).addExtraSpaceOnTop) {
+        if (this._codeEditor.getOption(EditorOption.find).addExtraSpaceOnTop) {
             this._viewZone = ( (new FindWidgetViewZone(0)));
         }
         this._register(this._codeEditor.onDidChangeModel(() => {
@@ -205,7 +210,7 @@ class FindWidget extends Widget {
     getPosition() {
         if (this._isVisible) {
             return {
-                preference: 0
+                preference: OverlayWidgetPositionPreference.TOP_RIGHT_CORNER
             };
         }
         return null;
@@ -234,7 +239,7 @@ class FindWidget extends Widget {
         }
         if (e.isReplaceRevealed) {
             if (this._state.isReplaceRevealed) {
-                if (!this._codeEditor.getOption(91 ) && !this._isReplaceVisible) {
+                if (!this._codeEditor.getOption(EditorOption.readOnly) && !this._isReplaceVisible) {
                     this._isReplaceVisible = true;
                     this._replaceInput.width = getTotalWidth(this._findInput.domNode);
                     this._updateButtons();
@@ -379,7 +384,7 @@ class FindWidget extends Widget {
         this._replaceAllBtn.setEnabled(this._isVisible && this._isReplaceVisible && findInputIsNonEmpty);
         this._domNode.classList.toggle('replaceToggled', this._isReplaceVisible);
         this._toggleReplaceBtn.setExpanded(this._isReplaceVisible);
-        const canReplace = !this._codeEditor.getOption(91 );
+        const canReplace = !this._codeEditor.getOption(EditorOption.readOnly);
         this._toggleReplaceBtn.setEnabled(this._isVisible && canReplace);
     }
     _reveal() {
@@ -390,7 +395,7 @@ class FindWidget extends Widget {
         if (!this._isVisible) {
             this._isVisible = true;
             const selection = this._codeEditor.getSelection();
-            switch (this._codeEditor.getOption(41 ).autoFindInSelection) {
+            switch (this._codeEditor.getOption(EditorOption.find).autoFindInSelection) {
                 case 'always':
                     this._toggleSelectionFind.checked = true;
                     break;
@@ -414,7 +419,7 @@ class FindWidget extends Widget {
             }, 200));
             this._codeEditor.layoutOverlayWidget(this);
             let adjustEditorScrollTop = true;
-            if (this._codeEditor.getOption(41 ).seedSearchStringFromSelection && selection) {
+            if (this._codeEditor.getOption(EditorOption.find).seedSearchStringFromSelection && selection) {
                 const domNode = this._codeEditor.getDomNode();
                 if (domNode) {
                     const editorCoords = getDomNodePagePosition(domNode);
@@ -459,7 +464,7 @@ class FindWidget extends Widget {
         }
     }
     _layoutViewZone(targetScrollTop) {
-        const addExtraSpaceOnTop = this._codeEditor.getOption(41 ).addExtraSpaceOnTop;
+        const addExtraSpaceOnTop = this._codeEditor.getOption(EditorOption.find).addExtraSpaceOnTop;
         if (!addExtraSpaceOnTop) {
             this._removeViewZone();
             return;
@@ -481,7 +486,7 @@ class FindWidget extends Widget {
         if (!this._isVisible) {
             return;
         }
-        const addExtraSpaceOnTop = this._codeEditor.getOption(41 ).addExtraSpaceOnTop;
+        const addExtraSpaceOnTop = this._codeEditor.getOption(EditorOption.find).addExtraSpaceOnTop;
         if (!addExtraSpaceOnTop) {
             return;
         }
@@ -505,7 +510,7 @@ class FindWidget extends Widget {
             }
             else {
                 let scrollAdjustment = this._getHeight();
-                scrollAdjustment -= this._codeEditor.getOption(84 ).top;
+                scrollAdjustment -= this._codeEditor.getOption(EditorOption.padding).top;
                 if (scrollAdjustment <= 0) {
                     return;
                 }
@@ -644,7 +649,7 @@ class FindWidget extends Widget {
         }
     }
     _onFindInputKeyDown(e) {
-        if (e.equals(ctrlKeyMod | 3 )) {
+        if (e.equals(ctrlKeyMod | KeyCode.Enter)) {
             if (this._keybindingService.dispatchEvent(e, e.target)) {
                 e.preventDefault();
                 return;
@@ -655,7 +660,7 @@ class FindWidget extends Widget {
                 return;
             }
         }
-        if (e.equals(2 )) {
+        if (e.equals(KeyCode.Tab)) {
             if (this._isReplaceVisible) {
                 this._replaceInput.focus();
             }
@@ -665,20 +670,20 @@ class FindWidget extends Widget {
             e.preventDefault();
             return;
         }
-        if (e.equals(2048  | 18 )) {
+        if (e.equals(KeyMod$1.CtrlCmd | KeyCode.DownArrow)) {
             this._codeEditor.focus();
             e.preventDefault();
             return;
         }
-        if (e.equals(16 )) {
+        if (e.equals(KeyCode.UpArrow)) {
             return stopPropagationForMultiLineUpwards(e, this._findInput.getValue(), this._findInput.domNode.querySelector('textarea'));
         }
-        if (e.equals(18 )) {
+        if (e.equals(KeyCode.DownArrow)) {
             return stopPropagationForMultiLineDownwards(e, this._findInput.getValue(), this._findInput.domNode.querySelector('textarea'));
         }
     }
     _onReplaceInputKeyDown(e) {
-        if (e.equals(ctrlKeyMod | 3 )) {
+        if (e.equals(ctrlKeyMod | KeyCode.Enter)) {
             if (this._keybindingService.dispatchEvent(e, e.target)) {
                 e.preventDefault();
                 return;
@@ -691,32 +696,32 @@ class FindWidget extends Widget {
                         'Ctrl+Enter now inserts line break instead of replacing all. You can modify the keybinding for editor.action.replaceAll to override this behavior.'
                     )));
                     this._ctrlEnterReplaceAllWarningPrompted = true;
-                    this._storageService.store(ctrlEnterReplaceAllWarningPromptedKey, true, 0 , 0 );
+                    this._storageService.store(ctrlEnterReplaceAllWarningPromptedKey, true, StorageScope.PROFILE, StorageTarget.USER);
                 }
                 this._replaceInput.inputBox.insertAtCursor('\n');
                 e.preventDefault();
                 return;
             }
         }
-        if (e.equals(2 )) {
+        if (e.equals(KeyCode.Tab)) {
             this._findInput.focusOnCaseSensitive();
             e.preventDefault();
             return;
         }
-        if (e.equals(1024  | 2 )) {
+        if (e.equals(KeyMod$1.Shift | KeyCode.Tab)) {
             this._findInput.focus();
             e.preventDefault();
             return;
         }
-        if (e.equals(2048  | 18 )) {
+        if (e.equals(KeyMod$1.CtrlCmd | KeyCode.DownArrow)) {
             this._codeEditor.focus();
             e.preventDefault();
             return;
         }
-        if (e.equals(16 )) {
+        if (e.equals(KeyCode.UpArrow)) {
             return stopPropagationForMultiLineUpwards(e, this._replaceInput.inputBox.value, this._replaceInput.inputBox.element.querySelector('textarea'));
         }
-        if (e.equals(18 )) {
+        if (e.equals(KeyCode.DownArrow)) {
             return stopPropagationForMultiLineDownwards(e, this._replaceInput.inputBox.value, this._replaceInput.inputBox.element.querySelector('textarea'));
         }
     }
@@ -777,7 +782,7 @@ class FindWidget extends Widget {
             }, true);
         }));
         this._register(this._findInput.onCaseSensitiveKeyDown((e) => {
-            if (e.equals(1024  | 2 )) {
+            if (e.equals(KeyMod$1.Shift | KeyCode.Tab)) {
                 if (this._isReplaceVisible) {
                     this._replaceInput.focus();
                     e.preventDefault();
@@ -785,7 +790,7 @@ class FindWidget extends Widget {
             }
         }));
         this._register(this._findInput.onRegexKeyDown((e) => {
-            if (e.equals(2 )) {
+            if (e.equals(KeyCode.Tab)) {
                 if (this._isReplaceVisible) {
                     this._replaceInput.focusOnPreserve();
                     e.preventDefault();
@@ -869,7 +874,7 @@ class FindWidget extends Widget {
                 this._state.change({ isRevealed: false, searchScope: null }, false);
             },
             onKeyDown: (e) => {
-                if (e.equals(2 )) {
+                if (e.equals(KeyCode.Tab)) {
                     if (this._isReplaceVisible) {
                         if (this._replaceBtn.isEnabled()) {
                             this._replaceBtn.focus();
@@ -910,7 +915,7 @@ class FindWidget extends Widget {
             }, true);
         }));
         this._register(this._replaceInput.onPreserveCaseKeyDown((e) => {
-            if (e.equals(2 )) {
+            if (e.equals(KeyCode.Tab)) {
                 if (this._prevBtn.isEnabled()) {
                     this._prevBtn.focus();
                 }
@@ -935,7 +940,7 @@ class FindWidget extends Widget {
                 this._controller.replace();
             },
             onKeyDown: (e) => {
-                if (e.equals(1024  | 2 )) {
+                if (e.equals(KeyMod$1.Shift | KeyCode.Tab)) {
                     this._closeBtn.focus();
                     e.preventDefault();
                 }
@@ -980,11 +985,7 @@ class FindWidget extends Widget {
         this._domNode.appendChild(findPart);
         this._domNode.appendChild(this._closeBtn.domNode);
         this._domNode.appendChild(replacePart);
-        this._resizeSash = this._register(( (new Sash(
-            this._domNode,
-            this,
-            { orientation: 0 , size: 2 }
-        ))));
+        this._resizeSash = this._register(( (new Sash(this._domNode, this, { orientation: Orientation.VERTICAL, size: 2 }))));
         this._resized = false;
         let originalWidth = FIND_WIDGET_INITIAL_WIDTH;
         this._register(this._resizeSash.onDidStart(() => {
@@ -1026,8 +1027,8 @@ class FindWidget extends Widget {
         }));
     }
     updateAccessibilitySupport() {
-        const value = this._codeEditor.getOption(2 );
-        this._findInput.setFocusInputOnOptionClick(value !== 2 );
+        const value = this._codeEditor.getOption(EditorOption.accessibilitySupport);
+        this._findInput.setFocusInputOnOptionClick(value !== AccessibilitySupport.Enabled);
     }
     getViewState() {
         let widgetViewZoneVisible = false;
@@ -1070,7 +1071,7 @@ class SimpleButton extends Widget {
             e.preventDefault();
         });
         this.onkeydown(this._domNode, (e) => {
-            if (e.equals(10 ) || e.equals(3 )) {
+            if (e.equals(KeyCode.Space) || e.equals(KeyCode.Enter)) {
                 this._opts.onTrigger();
                 e.preventDefault();
                 return;
@@ -1117,5 +1118,13 @@ registerThemingParticipant((theme, collector) => {
     if (hcBorder) {
         collector.addRule(`.monaco-editor .find-widget { border: 1px solid ${hcBorder}; }`);
     }
+    const findMatchForeground = theme.getColor(editorFindMatchForeground);
+    if (findMatchForeground) {
+        collector.addRule(`.monaco-editor .findMatchInline { color: ${findMatchForeground}; }`);
+    }
+    const findMatchHighlightForeground = theme.getColor(editorFindMatchHighlightForeground);
+    if (findMatchHighlightForeground) {
+        collector.addRule(`.monaco-editor .currentFindMatchInline { color: ${findMatchHighlightForeground}; }`);
+    }
 });
-export { FindWidget, FindWidgetViewZone, NLS_MATCHES_LOCATION, NLS_NO_RESULTS, SimpleButton, findNextMatchIcon, findPreviousMatchIcon, findReplaceAllIcon, findReplaceIcon };
+export { FindWidget, FindWidgetViewZone, NLS_MATCHES_LOCATION, NLS_NO_RESULTS, SimpleButton, findNextMatchIcon, findPreviousMatchIcon, findReplaceAllIcon, findReplaceIcon, findSelectionIcon };