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

Update to monaco 0.33 & vscode 1.65 #329

Merged
merged 4 commits into from
Mar 15, 2022
Merged

Update to monaco 0.33 & vscode 1.65 #329

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
f529eec
lib: Update monaco-editor-core
CGNonofr Mar 14, 2022
22c2e90
clean: Remove now useless casts
CGNonofr Mar 14, 2022
93bf73f
lib: Update vscode types
CGNonofr Mar 14, 2022
a9b09de
fix: Update code for new vscode types
CGNonofr Mar 14, 2022
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
40 changes: 20 additions & 20 deletions client/src/monaco-languages.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ export class MonacoLanguages implements Languages {

registerCompletionItemProvider(selector: DocumentSelector, provider: CompletionItemProvider, ...triggerCharacters: string[]): Disposable {
const completionProvider = this.createCompletionProvider(provider, ...triggerCharacters);
return this._monaco.languages.registerCompletionItemProvider(selector as any, completionProvider);
return this._monaco.languages.registerCompletionItemProvider(selector, completionProvider);
}

protected createCompletionProvider(provider: CompletionItemProvider, ...triggerCharacters: string[]): monaco.languages.CompletionItemProvider {
Expand All @@ -91,7 +91,7 @@ export class MonacoLanguages implements Languages {

registerHoverProvider(selector: DocumentSelector, provider: HoverProvider): Disposable {
const hoverProvider = this.createHoverProvider(provider);
return this._monaco.languages.registerHoverProvider(selector as any, hoverProvider);
return this._monaco.languages.registerHoverProvider(selector, hoverProvider);
}

protected createHoverProvider(provider: HoverProvider): monaco.languages.HoverProvider {
Expand All @@ -106,7 +106,7 @@ export class MonacoLanguages implements Languages {

registerSignatureHelpProvider(selector: DocumentSelector, provider: SignatureHelpProvider, ...triggerCharacters: string[]): Disposable {
const signatureHelpProvider = this.createSignatureHelpProvider(provider, ...triggerCharacters);
return this._monaco.languages.registerSignatureHelpProvider(selector as any, signatureHelpProvider);
return this._monaco.languages.registerSignatureHelpProvider(selector, signatureHelpProvider);
}

protected createSignatureHelpProvider(provider: SignatureHelpProvider, ...triggerCharacters: string[]): monaco.languages.SignatureHelpProvider {
Expand All @@ -124,7 +124,7 @@ export class MonacoLanguages implements Languages {

registerDefinitionProvider(selector: DocumentSelector, provider: DefinitionProvider): Disposable {
const definitionProvider = this.createDefinitionProvider(provider);
return this._monaco.languages.registerDefinitionProvider(selector as any, definitionProvider);
return this._monaco.languages.registerDefinitionProvider(selector, definitionProvider);
}

protected createDefinitionProvider(provider: DefinitionProvider): monaco.languages.DefinitionProvider {
Expand All @@ -139,7 +139,7 @@ export class MonacoLanguages implements Languages {

registerReferenceProvider(selector: DocumentSelector, provider: ReferenceProvider): Disposable {
const referenceProvider = this.createReferenceProvider(provider);
return this._monaco.languages.registerReferenceProvider(selector as any, referenceProvider);
return this._monaco.languages.registerReferenceProvider(selector, referenceProvider);
}

protected createReferenceProvider(provider: ReferenceProvider): monaco.languages.ReferenceProvider {
Expand All @@ -154,7 +154,7 @@ export class MonacoLanguages implements Languages {

registerDocumentHighlightProvider(selector: DocumentSelector, provider: DocumentHighlightProvider): Disposable {
const documentHighlightProvider = this.createDocumentHighlightProvider(provider);
return this._monaco.languages.registerDocumentHighlightProvider(selector as any, documentHighlightProvider);
return this._monaco.languages.registerDocumentHighlightProvider(selector, documentHighlightProvider);
}

protected createDocumentHighlightProvider(provider: DocumentHighlightProvider): monaco.languages.DocumentHighlightProvider {
Expand All @@ -169,7 +169,7 @@ export class MonacoLanguages implements Languages {

registerDocumentSymbolProvider(selector: DocumentSelector, provider: DocumentSymbolProvider): Disposable {
const documentSymbolProvider = this.createDocumentSymbolProvider(provider);
return this._monaco.languages.registerDocumentSymbolProvider(selector as any, documentSymbolProvider);
return this._monaco.languages.registerDocumentSymbolProvider(selector, documentSymbolProvider);
}

protected createDocumentSymbolProvider(provider: DocumentSymbolProvider): monaco.languages.DocumentSymbolProvider {
Expand All @@ -184,7 +184,7 @@ export class MonacoLanguages implements Languages {

registerCodeActionsProvider(selector: DocumentSelector, provider: CodeActionProvider): Disposable {
const codeActionProvider = this.createCodeActionProvider(provider);
return this._monaco.languages.registerCodeActionProvider(selector as any, codeActionProvider);
return this._monaco.languages.registerCodeActionProvider(selector, codeActionProvider);
}

protected createCodeActionProvider(provider: CodeActionProvider): monaco.languages.CodeActionProvider {
Expand All @@ -208,7 +208,7 @@ export class MonacoLanguages implements Languages {

registerCodeLensProvider(selector: DocumentSelector, provider: CodeLensProvider): Disposable {
const codeLensProvider = this.createCodeLensProvider(provider);
return this._monaco.languages.registerCodeLensProvider(selector as any, codeLensProvider);
return this._monaco.languages.registerCodeLensProvider(selector, codeLensProvider);
}

protected createCodeLensProvider(provider: CodeLensProvider): monaco.languages.CodeLensProvider {
Expand All @@ -232,7 +232,7 @@ export class MonacoLanguages implements Languages {

registerDocumentFormattingEditProvider(selector: DocumentSelector, provider: DocumentFormattingEditProvider): Disposable {
const documentFormattingEditProvider = this.createDocumentFormattingEditProvider(provider);
return this._monaco.languages.registerDocumentFormattingEditProvider(selector as any, documentFormattingEditProvider);
return this._monaco.languages.registerDocumentFormattingEditProvider(selector, documentFormattingEditProvider);
}

protected createDocumentFormattingEditProvider(provider: DocumentFormattingEditProvider): monaco.languages.DocumentFormattingEditProvider {
Expand All @@ -247,7 +247,7 @@ export class MonacoLanguages implements Languages {

registerDocumentRangeFormattingEditProvider(selector: DocumentSelector, provider: DocumentRangeFormattingEditProvider): Disposable {
const documentRangeFormattingEditProvider = this.createDocumentRangeFormattingEditProvider(provider);
return this._monaco.languages.registerDocumentRangeFormattingEditProvider(selector as any, documentRangeFormattingEditProvider);
return this._monaco.languages.registerDocumentRangeFormattingEditProvider(selector, documentRangeFormattingEditProvider);
}

createDocumentRangeFormattingEditProvider(provider: DocumentRangeFormattingEditProvider): monaco.languages.DocumentRangeFormattingEditProvider {
Expand All @@ -262,7 +262,7 @@ export class MonacoLanguages implements Languages {

registerOnTypeFormattingEditProvider(selector: DocumentSelector, provider: OnTypeFormattingEditProvider, firstTriggerCharacter: string, ...moreTriggerCharacter: string[]): Disposable {
const onTypeFormattingEditProvider = this.createOnTypeFormattingEditProvider(provider, firstTriggerCharacter, ...moreTriggerCharacter);
return this._monaco.languages.registerOnTypeFormattingEditProvider(selector as any, onTypeFormattingEditProvider);
return this._monaco.languages.registerOnTypeFormattingEditProvider(selector, onTypeFormattingEditProvider);
}

protected createOnTypeFormattingEditProvider(provider: OnTypeFormattingEditProvider, firstTriggerCharacter: string, ...moreTriggerCharacter: string[]): monaco.languages.OnTypeFormattingEditProvider {
Expand All @@ -279,7 +279,7 @@ export class MonacoLanguages implements Languages {

registerRenameProvider(selector: DocumentSelector, provider: RenameProvider): Disposable {
const renameProvider = this.createRenameProvider(provider);
return this._monaco.languages.registerRenameProvider(selector as any, renameProvider);
return this._monaco.languages.registerRenameProvider(selector, renameProvider);
}

protected createRenameProvider(provider: RenameProvider): monaco.languages.RenameProvider {
Expand All @@ -294,7 +294,7 @@ export class MonacoLanguages implements Languages {

registerDocumentLinkProvider(selector: DocumentSelector, provider: DocumentLinkProvider): Disposable {
const linkProvider = this.createDocumentLinkProvider(provider);
return this._monaco.languages.registerLinkProvider(selector as any, linkProvider);
return this._monaco.languages.registerLinkProvider(selector, linkProvider);
}

protected createDocumentLinkProvider(provider: DocumentLinkProvider): monaco.languages.LinkProvider {
Expand Down Expand Up @@ -322,7 +322,7 @@ export class MonacoLanguages implements Languages {

registerImplementationProvider(selector: DocumentSelector, provider: ImplementationProvider): Disposable {
const implementationProvider = this.createImplementationProvider(provider);
return this._monaco.languages.registerImplementationProvider(selector as any, implementationProvider);
return this._monaco.languages.registerImplementationProvider(selector, implementationProvider);
}

protected createImplementationProvider(provider: ImplementationProvider): monaco.languages.ImplementationProvider {
Expand All @@ -337,7 +337,7 @@ export class MonacoLanguages implements Languages {

registerTypeDefinitionProvider(selector: DocumentSelector, provider: TypeDefinitionProvider): Disposable {
const typeDefinitionProvider = this.createTypeDefinitionProvider(provider);
return this._monaco.languages.registerTypeDefinitionProvider(selector as any, typeDefinitionProvider);
return this._monaco.languages.registerTypeDefinitionProvider(selector, typeDefinitionProvider);
}

protected createTypeDefinitionProvider(provider: TypeDefinitionProvider): monaco.languages.TypeDefinitionProvider {
Expand All @@ -352,7 +352,7 @@ export class MonacoLanguages implements Languages {

registerColorProvider(selector: DocumentSelector, provider: DocumentColorProvider): Disposable {
const documentColorProvider = this.createDocumentColorProvider(provider);
return this._monaco.languages.registerColorProvider(selector as any, documentColorProvider);
return this._monaco.languages.registerColorProvider(selector, documentColorProvider);
}

protected createDocumentColorProvider(provider: DocumentColorProvider): monaco.languages.DocumentColorProvider {
Expand All @@ -377,7 +377,7 @@ export class MonacoLanguages implements Languages {

registerFoldingRangeProvider(selector: DocumentSelector, provider: FoldingRangeProvider): Disposable {
const foldingRangeProvider = this.createFoldingRangeProvider(provider);
return this._monaco.languages.registerFoldingRangeProvider(selector as any, foldingRangeProvider);
return this._monaco.languages.registerFoldingRangeProvider(selector, foldingRangeProvider);
}

protected createFoldingRangeProvider(provider: FoldingRangeProvider): monaco.languages.FoldingRangeProvider {
Expand All @@ -394,7 +394,7 @@ export class MonacoLanguages implements Languages {

registerDocumentSemanticTokensProvider(selector: DocumentSelector, provider: DocumentSemanticTokensProvider, legend: SemanticTokensLegend): Disposable {
const semanticTokensProvider = this.createSemanticTokensProvider(provider, legend);
return this._monaco.languages.registerDocumentSemanticTokensProvider(selector as any, semanticTokensProvider);
return this._monaco.languages.registerDocumentSemanticTokensProvider(selector, semanticTokensProvider);
}

protected createSemanticTokensProvider(provider: DocumentSemanticTokensProvider, legend: SemanticTokensLegend): monaco.languages.DocumentSemanticTokensProvider {
Expand All @@ -417,7 +417,7 @@ export class MonacoLanguages implements Languages {

registerDocumentRangeSemanticTokensProvider(selector: DocumentSelector, provider: DocumentRangeSemanticTokensProvider, legend: SemanticTokensLegend): Disposable {
const rangeSemanticTokensProvider = this.createRangeSemanticTokensProvider(provider, legend);
return this._monaco.languages.registerDocumentRangeSemanticTokensProvider(selector as any, rangeSemanticTokensProvider);
return this._monaco.languages.registerDocumentRangeSemanticTokensProvider(selector, rangeSemanticTokensProvider);
}

protected createRangeSemanticTokensProvider(provider: DocumentRangeSemanticTokensProvider, legend: SemanticTokensLegend): monaco.languages.DocumentRangeSemanticTokensProvider {
Expand Down
4 changes: 3 additions & 1 deletion client/src/monaco-workspace.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,9 @@ export class MonacoWorkspace implements Workspace {
}
this.onDidChangeTextDocumentEmitter.fire({
textDocument,
contentChanges
contentChanges,
isRedoing: event.isRedoing,
isUndoing: event.isUndoing
});
}

Expand Down
2 changes: 2 additions & 0 deletions client/src/services.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -246,6 +246,8 @@ export interface Languages {
export interface TextDocumentDidChangeEvent {
readonly textDocument: TextDocument;
readonly contentChanges: TextDocumentContentChangeEvent[];
readonly isUndoing: boolean;
readonly isRedoing: boolean;
}

export interface TextDocumentWillSaveEvent {
Expand Down
Loading