Skip to content

Commit 2e2b47a

Browse files
alexdimaalexdima
authored
Merge pull request microsoft#17933 from Microsoft/alex/tokenization
New tokens format & theme matching
2 parents c02a8d0 + a5a583e commit 2e2b47a

220 files changed

Lines changed: 82447 additions & 81028 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎build/monaco/monaco.d.ts.recipe‎

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -48,11 +48,14 @@ declare module monaco {
4848
#include(vs/editor/common/core/position): Position
4949
#include(vs/editor/common/core/range): Range
5050
#include(vs/editor/common/core/selection): Selection, SelectionDirection
51+
#include(vs/editor/common/core/token): Token
5152
}
5253

5354
declare module monaco.editor {
5455

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

7073
declare module monaco.languages {
7174

7275
#includeAll(vs/editor/browser/standalone/standaloneLanguages;modes.=>;editorCommon.=>editor.;IMarkerData=>editor.IMarkerData):
7376
#includeAll(vs/editor/common/modes/languageConfiguration):
74-
#includeAll(vs/editor/common/modes;editorCommon.IRange=>IRange;editorCommon.IPosition=>IPosition;editorCommon.=>editor.;IToken2=>IToken;ILineTokens2=>ILineTokens):
77+
#includeAll(vs/editor/common/modes;editorCommon.IRange=>IRange;editorCommon.IPosition=>IPosition;editorCommon.=>editor.):
7578
#include(vs/editor/common/services/modeService): ILanguageExtensionPoint
7679
#includeAll(vs/editor/common/modes/monarch/monarchTypes):
7780

0 commit comments

Comments
 (0)