SystemSh0cker/monaco-editor
1
0
Fork 0
mirror of https://github.com/microsoft/monaco-editor.git synced 2025-12-22 19:42:56 +01:00
Code Issues Projects Releases Packages Activity

Extract a common SelectionRangeAdapter

Browse source
This commit is contained in:
Alex Dima 2021-11-17 14:58:58 +01:00
parent b49f8ffd5f
commit 8f57069f86
No known key found for this signature in database
GPG key ID: 39563C1504FDD0C9
7 changed files with 59 additions and 115 deletions
Download patch file Download diff file Expand all files Collapse all files

43
src/common/lspLanguageFeatures.ts
View file

@ -956,3 +956,46 @@ function toFoldingRangeKind(
}
//#endregion
//#region SelectionRangeAdapter
export interface ILanguageWorkerWithSelectionRanges {
getSelectionRanges(uri: string, positions: lsTypes.Position[]): Promise<lsTypes.SelectionRange[]>;
}
export class SelectionRangeAdapter<T extends ILanguageWorkerWithSelectionRanges>
implements languages.SelectionRangeProvider
{
constructor(private _worker: WorkerAccessor<T>) {}
public provideSelectionRanges(
model: editor.IReadOnlyModel,
positions: Position[],
token: CancellationToken
): Promise<languages.SelectionRange[][] | undefined> {
const resource = model.uri;
return this._worker(resource)
.then((worker) =>
worker.getSelectionRanges(
resource.toString(),
positions.map<lsTypes.Position>(fromPosition)
)
)
.then((selectionRanges) => {
if (!selectionRanges) {
return;
}
return selectionRanges.map((selectionRange: lsTypes.SelectionRange | undefined) => {
const result: languages.SelectionRange[] = [];
while (selectionRange) {
result.push({ range: toRange(selectionRange.range) });
selectionRange = selectionRange.parent;
}
return result;
});
});
}
}
//#endregion

2
src/css/cssMode.ts
View file

@ -98,7 +98,7 @@ export function setupMode(defaults: LanguageServiceDefaults): IDisposable {
providers.push(
languages.registerSelectionRangeProvider(
languageId,
new languageFeatures.SelectionRangeAdapter(worker)
new languageFeatures.CSSSelectionRangeAdapter(worker)
)
);
}

41
src/css/languageFeatures.ts
View file

@ -5,12 +5,9 @@
import { LanguageServiceDefaults } from './monaco.contribution';
import type { CSSWorker } from './cssWorker';
import * as lsTypes from 'vscode-languageserver-types';
import { languages, editor, Uri, Position, CancellationToken } from '../fillers/monaco-editor-core';
import { Uri } from '../fillers/monaco-editor-core';
import {
DiagnosticsAdapter,
fromPosition,
toRange,
CompletionAdapter,
HoverAdapter,
DocumentHighlightAdapter,
@ -19,7 +16,8 @@ import {
RenameAdapter,
DocumentSymbolAdapter,
DocumentColorAdapter,
FoldingRangeAdapter
FoldingRangeAdapter,
SelectionRangeAdapter
} from '../common/lspLanguageFeatures';
export interface WorkerAccessor {
@ -54,35 +52,4 @@ export class CSSDocumentColorAdapter extends DocumentColorAdapter<CSSWorker> {}
export class CSSFoldingRangeAdapter extends FoldingRangeAdapter<CSSWorker> {}
export class SelectionRangeAdapter implements languages.SelectionRangeProvider {
constructor(private _worker: WorkerAccessor) {}
public provideSelectionRanges(
model: editor.IReadOnlyModel,
positions: Position[],
token: CancellationToken
): Promise<languages.SelectionRange[][] | undefined> {
const resource = model.uri;
return this._worker(resource)
.then((worker) =>
worker.getSelectionRanges(
resource.toString(),
positions.map<lsTypes.Position>(fromPosition)
)
)
.then((selectionRanges) => {
if (!selectionRanges) {
return;
}
return selectionRanges.map((selectionRange: lsTypes.SelectionRange | undefined) => {
const result: languages.SelectionRange[] = [];
while (selectionRange) {
result.push({ range: toRange(selectionRange.range) });
selectionRange = selectionRange.parent;
}
return result;
});
});
}
}
export class CSSSelectionRangeAdapter extends SelectionRangeAdapter<CSSWorker> {}

4
src/html/htmlMode.ts
View file

@ -40,7 +40,7 @@ export function setupMode1(defaults: LanguageServiceDefaults): void {
);
languages.registerSelectionRangeProvider(
languageId,
new languageFeatures.SelectionRangeAdapter(worker)
new languageFeatures.HTMLSelectionRangeAdapter(worker)
);
languages.registerRenameProvider(languageId, new languageFeatures.HTMLRenameAdapter(worker));
@ -127,7 +127,7 @@ export function setupMode(defaults: LanguageServiceDefaults): IDisposable {
providers.push(
languages.registerSelectionRangeProvider(
languageId,
new languageFeatures.SelectionRangeAdapter(worker)
new languageFeatures.HTMLSelectionRangeAdapter(worker)
)
);
}

41
src/html/languageFeatures.ts
View file

@ -4,11 +4,8 @@
*--------------------------------------------------------------------------------------------*/
import type { HTMLWorker } from './htmlWorker';
import * as lsTypes from 'vscode-languageserver-types';
import { languages, editor, Uri, Position, CancellationToken } from '../fillers/monaco-editor-core';
import { Uri } from '../fillers/monaco-editor-core';
import {
fromPosition,
toRange,
CompletionAdapter,
HoverAdapter,
DocumentHighlightAdapter,
@ -17,7 +14,8 @@ import {
DocumentLinkAdapter,
DocumentFormattingEditProvider,
DocumentRangeFormattingEditProvider,
FoldingRangeAdapter
FoldingRangeAdapter,
SelectionRangeAdapter
} from '../common/lspLanguageFeatures';
export interface WorkerAccessor {
@ -46,35 +44,4 @@ export class HTMLDocumentRangeFormattingEditProvider extends DocumentRangeFormat
export class HTMLFoldingRangeAdapter extends FoldingRangeAdapter<HTMLWorker> {}
export class SelectionRangeAdapter implements languages.SelectionRangeProvider {
constructor(private _worker: WorkerAccessor) {}
public provideSelectionRanges(
model: editor.IReadOnlyModel,
positions: Position[],
token: CancellationToken
): Promise<languages.SelectionRange[][] | undefined> {
const resource = model.uri;
return this._worker(resource)
.then((worker) =>
worker.getSelectionRanges(
resource.toString(),
positions.map<lsTypes.Position>(fromPosition)
)
)
.then((selectionRanges) => {
if (!selectionRanges) {
return;
}
return selectionRanges.map((selectionRange: lsTypes.SelectionRange | undefined) => {
const result: languages.SelectionRange[] = [];
while (selectionRange) {
result.push({ range: toRange(selectionRange.range) });
selectionRange = selectionRange.parent;
}
return result;
});
});
}
}
export class HTMLSelectionRangeAdapter extends SelectionRangeAdapter<HTMLWorker> {}

2
src/json/jsonMode.ts
View file

@ -89,7 +89,7 @@ export function setupMode(defaults: LanguageServiceDefaults): IDisposable {
providers.push(
languages.registerSelectionRangeProvider(
languageId,
new languageFeatures.SelectionRangeAdapter(worker)
new languageFeatures.JSONSelectionRangeAdapter(worker)
)
);
}

41
src/json/languageFeatures.ts
View file

@ -5,19 +5,17 @@
import { LanguageServiceDefaults } from './monaco.contribution';
import type { JSONWorker } from './jsonWorker';
import * as lsTypes from 'vscode-languageserver-types';
import { languages, editor, Uri, Position, CancellationToken } from '../fillers/monaco-editor-core';
import { editor, Uri } from '../fillers/monaco-editor-core';
import {
DiagnosticsAdapter,
fromPosition,
toRange,
CompletionAdapter,
HoverAdapter,
DocumentSymbolAdapter,
DocumentFormattingEditProvider,
DocumentRangeFormattingEditProvider,
DocumentColorAdapter,
FoldingRangeAdapter
FoldingRangeAdapter,
SelectionRangeAdapter
} from '../common/lspLanguageFeatures';
export interface WorkerAccessor {
@ -65,35 +63,4 @@ export class JSONDocumentColorAdapter extends DocumentColorAdapter<JSONWorker> {
export class JSONFoldingRangeAdapter extends FoldingRangeAdapter<JSONWorker> {}
export class SelectionRangeAdapter implements languages.SelectionRangeProvider {
constructor(private _worker: WorkerAccessor) {}
public provideSelectionRanges(
model: editor.IReadOnlyModel,
positions: Position[],
token: CancellationToken
): Promise<languages.SelectionRange[][] | undefined> {
const resource = model.uri;
return this._worker(resource)
.then((worker) =>
worker.getSelectionRanges(
resource.toString(),
positions.map<lsTypes.Position>(fromPosition)
)
)
.then((selectionRanges) => {
if (!selectionRanges) {
return;
}
return selectionRanges.map((selectionRange: lsTypes.SelectionRange | undefined) => {
const result: languages.SelectionRange[] = [];
while (selectionRange) {
result.push({ range: toRange(selectionRange.range) });
selectionRange = selectionRange.parent;
}
return result;
});
});
}
}
export class JSONSelectionRangeAdapter extends SelectionRangeAdapter<JSONWorker> {}