Skip to content

Commit

Permalink
8969-upgrade-monaco-editor-core-to-standalone-0.23.x
Browse files Browse the repository at this point in the history
In preparation for upgrading monaco-editor-core to standalone/0.23.x these changes were implemented:
1) signatures alignment to standalone/0.23.x
2) editor preferences synced with standalone/0.23.x
  • Loading branch information
danarad05 committed Mar 7, 2021
1 parent 8661060 commit f13162b
Show file tree
Hide file tree
Showing 2 changed files with 205 additions and 205 deletions.
12 changes: 6 additions & 6 deletions packages/editor/src/browser/editor-preferences.ts
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ const platform = {
isLinux: OS.type() === OS.Type.Linux
};

// should be in sync with https://github.com/theia-ide/vscode/blob/standalone/0.22.x/src/vs/editor/common/config/editorOptions.ts#L3679
// should be in sync with https://github.com/theia-ide/vscode/blob/standalone/0.23.x/src/vs/editor/common/config/editorOptions.ts#L3687
export const EDITOR_FONT_DEFAULTS = {
fontFamily: (
isOSX ? DEFAULT_MAC_FONT_FAMILY : (isWindows ? DEFAULT_WINDOWS_FONT_FAMILY : DEFAULT_LINUX_FONT_FAMILY)
Expand All @@ -48,7 +48,7 @@ export const EDITOR_FONT_DEFAULTS = {
letterSpacing: 0,
};

// should be in sync with https://github.com/theia-ide/vscode/blob/standalone/0.22.x/src/vs/editor/common/config/editorOptions.ts#L3694
// should be in sync with https://github.com/theia-ide/vscode/blob/standalone/0.23.x/src/vs/editor/common/config/editorOptions.ts#L3702
export const EDITOR_MODEL_DEFAULTS = {
tabSize: 4,
indentSize: 4,
Expand All @@ -64,11 +64,11 @@ export const DEFAULT_WORD_SEPARATORS = '`~!@#$%^&*()-=+[{]}\\|;:\'",.<>/?';
/* eslint-disable no-null/no-null */

// should be in sync with:
// 1. https://github.com/theia-ide/vscode/blob/standalone/0.22.x/src/vs/editor/common/config/commonEditorConfig.ts#L458
// 2. https://github.com/theia-ide/vscode/blob/standalone/0.22.x/src/vs/editor/common/config/commonEditorConfig.ts#L577
// 1. https://github.com/theia-ide/vscode/blob/standalone/0.23.x/src/vs/editor/common/config/commonEditorConfig.ts#L458
// 2. https://github.com/theia-ide/vscode/blob/standalone/0.23.x/src/vs/editor/common/config/commonEditorConfig.ts#L577

// 1. Copy from https://github.com/theia-ide/vscode/blob/standalone/0.22.x/src/vs/editor/common/config/commonEditorConfig.ts#L577
// 2. Align first items with https://github.com/theia-ide/vscode/blob/standalone/0.22.x/src/vs/editor/common/config/commonEditorConfig.ts#L458
// 1. Copy from https://github.com/theia-ide/vscode/blob/standalone/0.23.x/src/vs/editor/common/config/commonEditorConfig.ts#L577
// 2. Align first items with https://github.com/theia-ide/vscode/blob/standalone/0.23.x/src/vs/editor/common/config/commonEditorConfig.ts#L458
// 3. Find -> Use Regular Expressions to clean up data and replace " by ', for example -> nls\.localize\(.*, "(.*)"\) -> "$1"
// 4. Apply `quotemark` quick fixes
// 5. Fix the rest manually
Expand Down
Loading

0 comments on commit f13162b

Please sign in to comment.