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.

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

Jump to bottom

New tokens format & theme matching #17933

Merged
merged 45 commits into from
Jan 9, 2017
Merged

New tokens format & theme matching #17933

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
45 commits
Select commit Hold shift + click to select a range
c4b03ec
Standalone token themes as JS rules
alexdima Dec 27, 2016
ab2b0d2
Add tokenization/themes test
alexdima Dec 27, 2016
659914b
Simplify ITokenizationSupport:
alexdima Dec 27, 2016
122a07b
New tokens format
alexdima Dec 30, 2016
8905cb1
Remove token class name from every token
alexdima Dec 30, 2016
3767bd1
Merge branch 'master' into alex/tokenization
alexdima Dec 30, 2016
3b45a32
Add tokenization API
alexdima Dec 30, 2016
7efe807
Adopt latest loader
alexdima Jan 1, 2017
74b5f50
Monarch should always return non-null tokens
alexdima Jan 1, 2017
2319f16
Allow for theme switching
alexdima Jan 2, 2017
8572daa
merge tokens with equal metadata in manual tokenizer
alexdima Jan 2, 2017
0d3ac4f
Remove log statement
alexdima Jan 2, 2017
941812f
Memory usage improvements in KeybindingResolver
alexdima Jan 2, 2017
6e61a29
[email protected]
alexdima Jan 3, 2017
9cebde9
Remove standalone tokens CSS
alexdima Jan 3, 2017
8998f7a
Adopt new vscode textmate
alexdima Jan 3, 2017
616957b
Remove ModeTransition
alexdima Jan 3, 2017
467f42d
Prepare for theme integration tests
alexdima Jan 3, 2017
d43423b
[email protected]
alexdima Jan 4, 2017
10f6835
Themes integration tests
alexdima Jan 4, 2017
90d74c5
Use hex colors in themes integration tests
alexdima Jan 5, 2017
c7c64c3
Do not generate CSS for tokens in stylesContribution
alexdima Jan 5, 2017
c794f31
Remove paranoia check in ViewLineToken
alexdima Jan 5, 2017
a115c02
[email protected]
alexdima Jan 5, 2017
4ae1714
Do not wrap StackElement in TMState
alexdima Jan 5, 2017
68b8ad5
Fix tests
alexdima Jan 5, 2017
ebc43b3
Merge remote-tracking branch 'origin/master' into alex/tokenization
alexdima Jan 5, 2017
8df18d0
Rename properties of LanguageIdentifier
alexdima Jan 5, 2017
bb49af3
Remove model.getMode()
alexdima Jan 5, 2017
badd8d1
Remove model.getModeId()
alexdima Jan 5, 2017
89d594a
Small css tweaks
alexdima Jan 6, 2017
845bcec
Fix layer breaker in TMSyntax
alexdima Jan 6, 2017
4100f3e
Tweaks
alexdima Jan 6, 2017
4c3e4ee
Load language configuration when hitting embedded languages
alexdima Jan 6, 2017
a7c53f5
Phase out IMode
alexdima Jan 6, 2017
51b5727
Merge remote-tracking branch 'origin/master' into alex/tokenization
alexdima Jan 6, 2017
eff52e0
First cut of TM scopes inspection
alexdima Jan 6, 2017
e3dbd85
Improve TM inspect scopes
alexdima Jan 9, 2017
6de9bfd
Extract findMatchingThemeRule from themes test
alexdima Jan 9, 2017
8c668e8
Show matching theme rule in TM scopes inspector
alexdima Jan 9, 2017
38912c0
Reduce standalone editor API breakage
alexdima Jan 9, 2017
ed5613d
Add token inspector for standalone editor
alexdima Jan 9, 2017
8ba6bc5
Add standalone editor API for theme customization
alexdima Jan 9, 2017
88c45c4
Merge remote-tracking branch 'origin/master' into alex/tokenization
alexdima Jan 9, 2017
a5a583e
Skip tokenizing with TM lines over 20k chars
alexdima Jan 9, 2017
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
9 changes: 6 additions & 3 deletions build/monaco/monaco.d.ts.recipe
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,11 +48,14 @@ declare module monaco {
#include(vs/editor/common/core/position): Position
#include(vs/editor/common/core/range): Range
#include(vs/editor/common/core/selection): Selection, SelectionDirection
#include(vs/editor/common/core/token): Token
}

declare module monaco.editor {

#includeAll(vs/editor/browser/standalone/standaloneEditor;modes.=>languages.):
#includeAll(vs/editor/browser/standalone/standaloneEditor;modes.=>languages.;editorCommon.=>):
#include(vs/editor/common/services/standaloneColorService): BuiltinTheme, ITheme
#include(vs/editor/common/modes/supports/tokenization): IThemeRule
#include(vs/editor/common/services/webWorker): MonacoWebWorker, IWebWorkerOptions
#include(vs/editor/browser/standalone/standaloneCodeEditor): IEditorConstructionOptions, IDiffEditorConstructionOptions, IStandaloneCodeEditor, IStandaloneDiffEditor
export interface ICommandHandler {
Expand All @@ -63,15 +66,15 @@ export interface ICommandHandler {
#include(vs/platform/markers/common/markers): IMarkerData
#include(vs/editor/browser/standalone/colorizer): IColorizerOptions, IColorizerElementOptions
#include(vs/base/common/scrollable): ScrollbarVisibility
#includeAll(vs/editor/common/editorCommon;IMode=>languages.IMode): IPosition, IRange, ISelection, SelectionDirection, IScrollEvent
#includeAll(vs/editor/common/editorCommon;IMode=>languages.IMode;LanguageIdentifier=>languages.LanguageIdentifier): IPosition, IRange, ISelection, SelectionDirection, IScrollEvent
#includeAll(vs/editor/browser/editorBrowser;editorCommon.=>):
}

declare module monaco.languages {

#includeAll(vs/editor/browser/standalone/standaloneLanguages;modes.=>;editorCommon.=>editor.;IMarkerData=>editor.IMarkerData):
#includeAll(vs/editor/common/modes/languageConfiguration):
#includeAll(vs/editor/common/modes;editorCommon.IRange=>IRange;editorCommon.IPosition=>IPosition;editorCommon.=>editor.;IToken2=>IToken;ILineTokens2=>ILineTokens):
#includeAll(vs/editor/common/modes;editorCommon.IRange=>IRange;editorCommon.IPosition=>IPosition;editorCommon.=>editor.):
#include(vs/editor/common/services/modeService): ILanguageExtensionPoint
#includeAll(vs/editor/common/modes/monarch/monarchTypes):

Expand Down
Loading