Skip to content
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.

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

Migrate from PhosphorJS to Lumino #14320

Open
wants to merge 29 commits into
base: master
Choose a base branch
from
Open
Changes from 1 commit
Commits
Show all changes
29 commits
Select commit Hold shift + click to select a range
8a72f37
[lumino] consume lumino packages
sdirix Oct 15, 2024
765afa3
[lumino] migrate to lumino styles
sdirix Oct 15, 2024
d8b6b24
[lumino] code changes
sdirix Oct 15, 2024
c4fbdd9
[lumino] lumino patch
sdirix Oct 15, 2024
b3dddca
[lumino] remove no longer needed underline adjustment
sdirix Oct 15, 2024
986a738
Merge branch 'upstream/master' into lumino-migration
sdirix Nov 28, 2024
2e8a052
chore: replace mentions of Phosphor with Lumino
sdirix Nov 28, 2024
b074e61
[lumino] mock DragEvent in test setup
sdirix Nov 29, 2024
8844c4f
[lumino] further DragEvent adaptations
sdirix Nov 29, 2024
891f912
[lumino] adjust search-in-workspace-widget
sdirix Nov 29, 2024
5230998
[lumino] remove check in 'MenuBar' subclass
sdirix Nov 29, 2024
d39fbbc
Use widget document as context menu host.
tsmaeder Dec 2, 2024
45a3fb4
Fix scroll bar behavior on editor tab bar
tsmaeder Dec 6, 2024
9092eb3
Fix sidebar ellipsis behavior
tsmaeder Dec 20, 2024
f4dc983
Merge remote-tracking branch 'origin/master' into lumino-migration
tsmaeder Dec 20, 2024
e5629f3
Fix compile error
tsmaeder Dec 20, 2024
09a94d4
Add "overflow: hidden" to preferences editor widget
tsmaeder Dec 20, 2024
cba31c9
[lumino] never return empty menus
sdirix Dec 23, 2024
168b3cd
[lumino] wip - adapt menu focus behavior
sdirix Dec 23, 2024
d9d3f91
[lumino] fix terminal id
sdirix Dec 23, 2024
ba01608
[lumino] update lumino patch
sdirix Dec 23, 2024
cbc68a9
[lumino] streamline menu focus
sdirix Dec 23, 2024
e588806
Merge remote-tracking branch 'upstream/master' into lumino-migration
sdirix Jan 13, 2025
e2df32d
Use fixedOverflowWidgets = false. Fixes overlay widgets in editor
tsmaeder Jan 23, 2025
d9fa0e8
Merge remote-tracking branch 'upstream/master' into lumino-migration
sdirix Feb 4, 2025
7874fe6
Add context element to context menu invocations.
tsmaeder Feb 5, 2025
d024af8
Fix problems related with menu bar updates on focus change.
tsmaeder Feb 7, 2025
c387dce
Merge remote-tracking branch 'upstream/master' into lumino-migration
sdirix Mar 4, 2025
0983a4c
[lumino] add changelog entry and adapt test package version
sdirix Mar 4, 2025
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
Prev Previous commit
Next Next commit
Use fixedOverflowWidgets = false. Fixes overlay widgets in editor
Signed-off-by: Thomas Mäder <[email protected]>
tsmaeder authored and sdirix committed Jan 27, 2025
commit e2df32d28881ab356098006154fddfc6fd6048df
2 changes: 1 addition & 1 deletion packages/monaco/src/browser/monaco-diff-editor.ts
Original file line number Diff line number Diff line change
@@ -69,7 +69,7 @@ export class MonacoDiffEditor extends MonacoEditor {
}

protected override create(options?: IDiffEditorConstructionOptions, override?: EditorServiceOverrides): Disposable {
options = { ...options, fixedOverflowWidgets: true };
options = { ...options, fixedOverflowWidgets: false };
const instantiator = this.getInstantiatorWithOverrides(override);
/**
* @monaco-uplift. Should be guaranteed to work.
4 changes: 2 additions & 2 deletions packages/monaco/src/browser/monaco-editor-provider.ts
Original file line number Diff line number Diff line change
@@ -413,7 +413,7 @@ export class MonacoEditorProvider {
overviewRulerBorder: false,
scrollBeyondLastLine: false,
renderLineHighlight: 'none',
fixedOverflowWidgets: true,
fixedOverflowWidgets: false,
acceptSuggestionOnEnter: 'smart',
minimap: {
enabled: false
@@ -425,7 +425,7 @@ export class MonacoEditorProvider {
options = {
scrollBeyondLastLine: true,
overviewRulerLanes: 2,
fixedOverflowWidgets: true,
fixedOverflowWidgets: false,
minimap: { enabled: false },
renderSideBySide: false,
readOnly: true,
2 changes: 1 addition & 1 deletion packages/monaco/src/browser/monaco-editor.ts
Original file line number Diff line number Diff line change
@@ -151,7 +151,7 @@ export class MonacoEditor extends MonacoEditorServices implements TextEditor {
const combinedOptions = {
...options,
lightbulb: { enabled: true },
fixedOverflowWidgets: true,
fixedOverflowWidgets: false,
scrollbar: {
useShadows: false,
verticalHasArrows: false,
2 changes: 1 addition & 1 deletion packages/monaco/src/browser/simple-monaco-editor.ts
Original file line number Diff line number Diff line change
@@ -88,7 +88,7 @@ export class SimpleMonacoEditor extends MonacoEditorServices implements Disposab
const combinedOptions = {
...options,
lightbulb: { enabled: true },
fixedOverflowWidgets: true,
fixedOverflowWidgets: false,
automaticLayout: true,
scrollbar: {
useShadows: false,
2 changes: 1 addition & 1 deletion packages/output/src/browser/output-editor-factory.ts
Original file line number Diff line number Diff line change
@@ -47,7 +47,7 @@ export class OutputEditorFactory implements MonacoEditorFactory {
...defaultOptions,
overviewRulerLanes: 3,
lineNumbersMinChars: 3,
fixedOverflowWidgets: true,
fixedOverflowWidgets: false,
wordWrap: 'off',
lineNumbers: 'off',
glyphMargin: false,