Skip to content

Uplift Monaco to VSCode 1.67.2 #11331

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Jul 12, 2022
Merged

Uplift Monaco to VSCode 1.67.2 #11331

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
d890bda
Uplift Monaco to VSCode 1.67.2
Jun 17, 2022
438c907
Typos
Jul 7, 2022
34278aa
Remove alpha tag
Jul 12, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion examples/api-samples/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
"@theia/file-search": "1.27.0",
"@theia/filesystem": "1.27.0",
"@theia/monaco": "1.27.0",
"@theia/monaco-editor-core": "1.65.2",
"@theia/monaco-editor-core": "1.67.2",
"@theia/output": "1.27.0",
"@theia/search-in-workspace": "1.27.0",
"@theia/toolbar": "1.27.0",
Expand Down
2 changes: 1 addition & 1 deletion packages/bulk-edit/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
"@theia/editor": "1.27.0",
"@theia/filesystem": "1.27.0",
"@theia/monaco": "1.27.0",
"@theia/monaco-editor-core": "1.65.2",
"@theia/monaco-editor-core": "1.67.2",
"@theia/workspace": "1.27.0"
},
"publishConfig": {
Expand Down
2 changes: 1 addition & 1 deletion packages/console/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
"dependencies": {
"@theia/core": "1.27.0",
"@theia/monaco": "1.27.0",
"@theia/monaco-editor-core": "1.65.2",
"@theia/monaco-editor-core": "1.67.2",
"anser": "^2.0.1"
},
"publishConfig": {
Expand Down
3 changes: 3 additions & 0 deletions packages/core/src/common/color.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,10 @@ export interface HSLA {
export interface ColorDefaults {
light?: Color
dark?: Color
/** @deprecated @since 1.28.0 Please use hcDark and hcLight. This field will be ignored unless `hcDark` is absent. */
hc?: Color
hcDark?: Color;
hcLight?: Color;
}

export interface ColorDefinition {
Expand Down
2 changes: 1 addition & 1 deletion packages/debug/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
"@theia/filesystem": "1.27.0",
"@theia/markers": "1.27.0",
"@theia/monaco": "1.27.0",
"@theia/monaco-editor-core": "1.65.2",
"@theia/monaco-editor-core": "1.67.2",
"@theia/output": "1.27.0",
"@theia/process": "1.27.0",
"@theia/task": "1.27.0",
Expand Down
6 changes: 3 additions & 3 deletions packages/debug/src/browser/editor/debug-inline-value-decorator.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -162,7 +162,7 @@ export class DebugInlineValueDecorator implements FrontendApplicationContributio
private createInlineValueDecoration(lineNumber: number, contentText: string): IDecorationOptions {
// If decoratorText is too long, trim and add ellipses. This could happen for minified files with everything on a single line
if (contentText.length > MAX_INLINE_DECORATOR_LENGTH) {
contentText = contentText.substr(0, MAX_INLINE_DECORATOR_LENGTH) + '...';
contentText = contentText.substring(0, MAX_INLINE_DECORATOR_LENGTH) + '...';
}

return {
Expand Down Expand Up @@ -210,8 +210,8 @@ export class DebugInlineValueDecorator implements FrontendApplicationContributio
continue;
}

model.forceTokenization(lineNumber);
const lineTokens = model.getLineTokens(lineNumber);
model.tokenization.forceTokenization(lineNumber);
const lineTokens = model.tokenization.getLineTokens(lineNumber);
for (let tokenIndex = 0, tokenCount = lineTokens.getCount(); tokenIndex < tokenCount; tokenIndex++) {
const tokenStartOffset = lineTokens.getStartOffset(tokenIndex);
const tokenEndOffset = lineTokens.getEndOffset(tokenIndex);
Expand Down
210 changes: 144 additions & 66 deletions packages/editor/src/browser/editor-generated-preference-schema.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -123,54 +123,48 @@ export const editorGeneratedPreferenceProperties: PreferenceSchema['properties']
"restricted": false
},
"editor.language.brackets": {
"default": false,
"type": [
"array",
"null"
],
"default": null,
"description": nls.localizeByDefault("Defines the bracket symbols that increase or decrease the indentation."),
"anyOf": [
{ "const": false },
{
"type": "array",
"items": {
"type": "array",
"items": [
{
"type": "string",
"description": nls.localizeByDefault("The opening bracket character or string sequence.")
},
{
"type": "string",
"description": nls.localizeByDefault("The closing bracket character or string sequence.")
}
]
"items": {
"type": "array",
"items": [
{
"type": "string",
"description": nls.localizeByDefault("The opening bracket character or string sequence.")
},

},
],
{
"type": "string",
"description": nls.localizeByDefault("The closing bracket character or string sequence.")
}
]
},
"scope": "language-overridable",
"restricted": false
},
"editor.language.colorizedBracketPairs": {
"default": false,
"type": [
"array",
"null"
],
"default": null,
"description": nls.localize("theia/editor/editor.language.colorizedBracketPairs", "Defines the bracket pairs that are colorized by their nesting level if bracket pair colorization is enabled."),
"anyOf": [
{ "const": false },
{
"type": "array",
"items": {
"type": "array",
"items": [
{
"type": "string",
"description": nls.localizeByDefault("The opening bracket character or string sequence.")
},
{
"type": "string",
"description": nls.localizeByDefault("The closing bracket character or string sequence.")
}
]
"items": {
"type": "array",
"items": [
{
"type": "string",
"description": nls.localizeByDefault("The opening bracket character or string sequence.")
},

},
],
{
"type": "string",
"description": nls.localizeByDefault("The closing bracket character or string sequence.")
}
]
},
"scope": "language-overridable",
"restricted": false
},
Expand Down Expand Up @@ -395,9 +389,16 @@ export const editorGeneratedPreferenceProperties: PreferenceSchema['properties']
"restricted": false
},
"editor.bracketPairColorization.enabled": {
"type": "boolean",
"default": true,
"markdownDescription": nls.localize("theia/editor/editor.bracketPairColorization.enabled", "Controls whether bracket pair colorization is enabled or not. Use `#workbench.colorCustomizations#` to override the bracket highlight colors."),
"scope": "language-overridable",
"restricted": false
},
"editor.bracketPairColorization.independentColorPoolPerBracketType": {
"type": "boolean",
"default": false,
"description": nls.localize("theia/editor/editor.bracketPairColorization.enabled", "Controls whether bracket pair colorization is enabled or not. Use 'workbench.colorCustomizations' to override the bracket highlight colors."),
"description": nls.localize("theia/editor/editor.bracketPairColorization.independentColorPoolPerBracketType", "Controls whether each bracket type has its own independent color pool."),
"scope": "language-overridable",
"restricted": false
},
Expand Down Expand Up @@ -456,7 +457,20 @@ export const editorGeneratedPreferenceProperties: PreferenceSchema['properties']
"restricted": false
},
"editor.guides.highlightActiveIndentation": {
"type": "boolean",
"type": [
"boolean",
"string"
],
"enum": [
true,
"always",
false
],
"enumDescriptions": [
nls.localize("theia/editor/editor.guides.highlightActiveIndentation0", "Highlights the active indent guide."),
nls.localize("theia/editor/editor.guides.highlightActiveIndentation1", "Highlights the active indent guide even if bracket guides are highlighted."),
nls.localize("theia/editor/editor.guides.highlightActiveIndentation2", "Do not highlight the active indent guide.")
],
"default": true,
"description": nls.localizeByDefault("Controls whether the editor should highlight the active indent guide."),
"scope": "language-overridable",
Expand Down Expand Up @@ -651,6 +665,12 @@ export const editorGeneratedPreferenceProperties: PreferenceSchema['properties']
"scope": "language-overridable",
"restricted": false
},
"editor.find.globalFindClipboard": {
"type": "boolean",
"default": false,
"description": nls.localizeByDefault("Controls whether the Find Widget should read or modify the shared find clipboard on macOS."),
"included": isOSX
},
"editor.find.addExtraSpaceOnTop": {
"type": "boolean",
"default": true,
Expand Down Expand Up @@ -1312,29 +1332,80 @@ export const editorGeneratedPreferenceProperties: PreferenceSchema['properties']
"type": "object",
"properties": {
"strings": {
"type": "boolean",
"default": false,
"anyOf": [
{
"type": "boolean"
},
{
"type": "string",
"enum": [
"on",
"inline",
"off"
],
"enumDescriptions": [
nls.localize("theia/editor/editor.quickSuggestions0", "Quick suggestions show inside the suggest widget"),
nls.localize("theia/editor/editor.quickSuggestions1", "Quick suggestions show as ghost text"),
nls.localize("theia/editor/editor.quickSuggestions2", "Quick suggestions are disabled")
]
}
],
"default": "off",
"description": nls.localizeByDefault("Enable quick suggestions inside strings.")
},
"comments": {
"type": "boolean",
"default": false,
"anyOf": [
{
"type": "boolean"
},
{
"type": "string",
"enum": [
"on",
"inline",
"off"
],
"enumDescriptions": [
nls.localize("theia/editor/editor.quickSuggestions0", "Quick suggestions show inside the suggest widget"),
nls.localize("theia/editor/editor.quickSuggestions1", "Quick suggestions show as ghost text"),
nls.localize("theia/editor/editor.quickSuggestions2", "Quick suggestions are disabled")
]
}
],
"default": "off",
"description": nls.localizeByDefault("Enable quick suggestions inside comments.")
},
"other": {
"type": "boolean",
"default": true,
"anyOf": [
{
"type": "boolean"
},
{
"type": "string",
"enum": [
"on",
"inline",
"off"
],
"enumDescriptions": [
nls.localize("theia/editor/editor.quickSuggestions0", "Quick suggestions show inside the suggest widget"),
nls.localize("theia/editor/editor.quickSuggestions1", "Quick suggestions show as ghost text"),
nls.localize("theia/editor/editor.quickSuggestions2", "Quick suggestions are disabled")
]
}
],
"default": "on",
"description": nls.localizeByDefault("Enable quick suggestions outside of strings and comments.")
}
}
}
],
"default": {
"other": true,
"comments": false,
"strings": false
"other": "on",
"comments": "off",
"strings": "off"
},
"description": nls.localizeByDefault("Controls whether suggestions should automatically show up while typing."),
"markdownDescription": nls.localizeByDefault("Controls whether suggestions should automatically show up while typing."),
"scope": "language-overridable",
"restricted": false
},
Expand Down Expand Up @@ -2132,16 +2203,28 @@ export const editorGeneratedPreferenceProperties: PreferenceSchema['properties']
"restricted": false
},
"editor.inlayHints.enabled": {
"type": "boolean",
"default": true,
"type": "string",
"default": "on",
"description": nls.localize("theia/editor/editor.inlayHints.enabled", "Enables the inlay hints in the editor."),
"enum": [
"on",
"onUnlessPressed",
"offUnlessPressed",
"off"
],
"markdownEnumDescriptions": [
nls.localize("theia/editor/editor.inlayHints.enabled0", "Inlay hints are enabled"),
nls.localize("theia/editor/editor.inlayHints.enabled1", "Inlay hints are showing by default and hide when holding `Ctrl+Alt`"),
nls.localize("theia/editor/editor.inlayHints.enabled2", "Inlay hints are hidden by default and show when holding `Ctrl+Alt`"),
nls.localize("theia/editor/editor.inlayHints.enabled3", "Inlay hints are disabled")
],
"scope": "language-overridable",
"restricted": false
},
"editor.inlayHints.fontSize": {
"type": "number",
"default": 0,
"markdownDescription": nls.localize("theia/editor/editor.inlayHints.fontSize", "Controls font size of inlay hints in the editor. A default of 90% of `#editor.fontSize#` is used when the configured value is less than `5` or greater than the editor font size."),
"markdownDescription": nls.localize("theia/editor/editor.inlayHints.fontSize", "Controls font size of inlay hints in the editor. As default the `#editor.fontSize#` is used when the configured value is less than `5` or greater than the editor font size."),
"scope": "language-overridable",
"restricted": false
},
Expand All @@ -2152,12 +2235,6 @@ export const editorGeneratedPreferenceProperties: PreferenceSchema['properties']
"scope": "language-overridable",
"restricted": false
},
"editor.find.globalFindClipboard": {
"type": "boolean",
"default": false,
"description": nls.localizeByDefault("Controls whether the Find Widget should read or modify the shared find clipboard on macOS."),
"included": isOSX
},
"editor.selectionClipboard": {
"type": "boolean",
"default": true,
Expand All @@ -2180,8 +2257,8 @@ export interface GeneratedEditorPreferences {
'editor.semanticHighlighting.enabled': true | false | 'configuredByTheme';
'editor.stablePeek': boolean;
'editor.maxTokenizationLineLength': number;
'editor.language.brackets': Array<[string, string]> | false;
'editor.language.colorizedBracketPairs': Array<[string, string]> | false;
'editor.language.brackets': Array<[string, string]> | null;
'editor.language.colorizedBracketPairs': Array<[string, string]> | null;
'diffEditor.maxComputationTime': number;
'diffEditor.maxFileSize': number;
'diffEditor.renderSideBySide': boolean;
Expand All @@ -2200,11 +2277,12 @@ export interface GeneratedEditorPreferences {
'editor.autoIndent': 'none' | 'keep' | 'brackets' | 'advanced' | 'full';
'editor.autoSurround': 'languageDefined' | 'quotes' | 'brackets' | 'never';
'editor.bracketPairColorization.enabled': boolean;
'editor.bracketPairColorization.independentColorPoolPerBracketType': boolean;
'editor.guides.bracketPairs': true | 'active' | false;
'editor.guides.bracketPairsHorizontal': true | 'active' | false;
'editor.guides.highlightActiveBracketPair': boolean;
'editor.guides.indentation': boolean;
'editor.guides.highlightActiveIndentation': boolean;
'editor.guides.highlightActiveIndentation': true | 'always' | false;
'editor.codeLens': boolean;
'editor.codeLensFontFamily': string;
'editor.codeLensFontSize': number;
Expand Down Expand Up @@ -2237,7 +2315,7 @@ export interface GeneratedEditorPreferences {
'editor.fontFamily': string;
'editor.fontLigatures': boolean | string;
'editor.fontSize': number;
'editor.fontWeight': number | string;
'editor.fontWeight': number | string | 'normal' | 'bold' | '100' | '200' | '300' | '400' | '500' | '600' | '700' | '800' | '900';
'editor.formatOnPaste': boolean;
'editor.formatOnType': boolean;
'editor.glyphMargin': boolean;
Expand Down Expand Up @@ -2370,7 +2448,7 @@ export interface GeneratedEditorPreferences {
'editor.wrappingIndent': 'none' | 'same' | 'indent' | 'deepIndent';
'editor.wrappingStrategy': 'simple' | 'advanced';
'editor.showDeprecated': boolean;
'editor.inlayHints.enabled': boolean;
'editor.inlayHints.enabled': 'on' | 'onUnlessPressed' | 'offUnlessPressed' | 'off';
'editor.inlayHints.fontSize': number;
'editor.inlayHints.fontFamily': string;
'editor.selectionClipboard': boolean;
Expand Down
2 changes: 1 addition & 1 deletion packages/git/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
"@theia/core": "1.27.0",
"@theia/editor": "1.27.0",
"@theia/filesystem": "1.27.0",
"@theia/monaco-editor-core": "1.65.2",
"@theia/monaco-editor-core": "1.67.2",
"@theia/navigator": "1.27.0",
"@theia/scm": "1.27.0",
"@theia/scm-extra": "1.27.0",
Expand Down
Loading