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

Refactor editor options #80469

Merged
merged 29 commits into from
Sep 6, 2019
Merged
Changes from 1 commit
Commits
Show all changes
29 commits
Select commit Hold shift + click to select a range
2a72088
Introduce a new way to manage editor options
alexdima Aug 30, 2019
75ffa8b
- Add a typed way to read options
alexdima Sep 2, 2019
363b976
Convert more editor options
alexdima Sep 2, 2019
9ab08c2
Adopt conditional types for editor options reading
alexdima Sep 2, 2019
16c1772
renames
alexdima Sep 2, 2019
844c90a
Lift editor options key name to a generic
alexdima Sep 2, 2019
0512050
Migrate more editor options
alexdima Sep 3, 2019
802826e
Move more editor options
alexdima Sep 3, 2019
e787da1
Merge remote-tracking branch 'origin/master' into alex/editor-options
alexdima Sep 4, 2019
2adf01f
Convert more editor options
alexdima Sep 5, 2019
9e39427
Add test for eventing
alexdima Sep 5, 2019
dd0fe9e
Migrate computed editor options
alexdima Sep 5, 2019
27adb78
Migrate fontInfo to the new editor option format
alexdima Sep 5, 2019
e9581bc
Add EditorFontSize
alexdima Sep 5, 2019
bcd154c
Keep mixin of the raw options
alexdima Sep 5, 2019
ad3289c
Remove IEditorOption.equals
alexdima Sep 5, 2019
b11d96f
Simplify editor options
alexdima Sep 6, 2019
d625a4b
Merge remote-tracking branch 'origin/master' into alex/editor-options
alexdima Sep 6, 2019
b01cb4f
Fix default value
alexdima Sep 6, 2019
61d0aa4
Fix tests
alexdima Sep 6, 2019
292f3ab
Reorder options
alexdima Sep 6, 2019
959c017
Rearrange editor options
alexdima Sep 6, 2019
744eb29
Simplify EditorLayoutInfoComputer
alexdima Sep 6, 2019
fa66d15
:lipstick:
alexdima Sep 6, 2019
7af9255
More editor options adoption
alexdima Sep 6, 2019
e766914
Migrate editor options schemas for booleans
alexdima Sep 6, 2019
b71b8a4
Move schemas next to the editor options
alexdima Sep 6, 2019
c84821f
:lipstick:
alexdima Sep 6, 2019
7b4c755
Merge remote-tracking branch 'origin/master' into alex/editor-options
alexdima Sep 6, 2019
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
Fix tests
alexdima committed Sep 6, 2019

Verified

This commit was signed with the committer’s verified signature.
Dr-Blank Dr.Blank
commit 61d0aa4d05cd09cb56c2963d37870c11ca52eaf5
7 changes: 6 additions & 1 deletion src/vs/editor/test/browser/testCodeEditor.ts
Original file line number Diff line number Diff line change
@@ -91,7 +91,12 @@ export function withTestCodeEditor(text: string | string[] | null, options: Test

export function createTestCodeEditor(options: TestCodeEditorCreationOptions): TestCodeEditor {

const model = options.model;
delete options.model;

const services: ServiceCollection = options.serviceCollection || new ServiceCollection();
delete options.serviceCollection;

const instantiationService: IInstantiationService = new InstantiationService(services);

if (!services.has(ICodeEditorService)) {
@@ -119,6 +124,6 @@ export function createTestCodeEditor(options: TestCodeEditorCreationOptions): Te
options,
codeEditorWidgetOptions
);
editor.setModel(options.model);
editor.setModel(model);
return editor;
}