This repository has been archived by the owner on Mar 22, 2024. It is now read-only.
-
-
Notifications
You must be signed in to change notification settings - Fork 13
Properly separate and define classic and extended editor #54
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
kaisalmen
force-pushed
the
vscode-themes-textmate
branch
from
October 7, 2023 15:27
955e0c8
to
a662b88
Compare
kaisalmen
changed the title
Ensure vscode editor always comes with themes and textmate enabled.
Properly separate and define classic and extended editor
Oct 7, 2023
kaisalmen
force-pushed
the
vscode-themes-textmate
branch
from
October 7, 2023 20:17
8d8d07c
to
49982eb
Compare
This was referenced Oct 7, 2023
kaisalmen
force-pushed
the
vscode-themes-textmate
branch
from
October 11, 2023 06:52
791daab
to
13c79ce
Compare
kaisalmen
force-pushed
the
vscode-themes-textmate
branch
from
October 13, 2023 09:10
bb1a5e4
to
ae25843
Compare
montymxb
reviewed
Oct 13, 2023
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Some comments & suggestions. I was not able to test this locally, yet, but if the built-in examples run as expected I would be up for approving & adding in. Since this is a pre-release that may be fine as is, allowing us to verify how this integrates in practice.
montymxb
approved these changes
Oct 16, 2023
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Approved. Changes look good, tested the new additions out locally as well and everything seems to be in order. Next step is trying out the preview release
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
@montymxb when I reviewed the tutorial update I realized that the terminology around classic editor and vscode-api is not properly defined here. This PR should cleans this up; in the code and the documentation.
monaco-vscode-api
is the foundation for everything here and therefore using something like vscodApi for one of the editor config/modes is misleading. This PR corrects this:monaco-editor
as you would when using it directlymonaco-editor
like a VSCode extensionIn case of extended mode it is ensured textmate and theme services, plus the default themes are available when you use it.
userConfiguration
is now only available in this mode as the regular editorOptions should be used in *classic mode.I spent some time cleaning
EditorAppBase
no longer depending on any code from extending classes. This is now cleaner. Sorry this PR grew a lot bigger than initially intended, but it helps if code and description are in-line.next release are available for testing:
https://www.npmjs.com/package/monaco-editor-wrapper/v/3.3.0-next.2
https://www.npmjs.com/package/@typefox/monaco-editor-react/v/2.3.0-next.2
This change will also make the Langium web template config easier as it removes the need for separate bundles, because everything required is configured on this level already. The latest commit there use the next version now.
The latest commit moves
editorOptions
,diffEditorOptions
andoverrideAutomaticLayout
toEditorAppConfigBase
. This allows to set editor parameters directly which may help overcome monaco-editor related configuration problems and wasn't present inextended
mode before.