Microsoft/vscode
1
0
Fork 0
mirror of https://github.com/microsoft/vscode.git synced 2026-04-23 18:19:12 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'main' into sandy081/policy

Browse Source
This commit is contained in:
Sandeep Somavarapu
2022-05-13 08:39:05 +02:00
parent 281d6155e5 113287ccc3
commit 5eb8bee367
144 changed files with 2185 additions and 1247 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/vs/workbench/api/common/extHost.api.impl.ts
View File

@@ -453,7 +453,8 @@ export function createApiFactoryAndRegisterActors(accessor: ServicesAccessor): I
return extHostLanguages.changeLanguage(document.uri, languageId);
},
match(selector: vscode.DocumentSelector, document: vscode.TextDocument): number {
return score(typeConverters.LanguageSelector.from(selector), document.uri, document.languageId, true, document.notebook?.notebookType);
const notebookType = extHostDocuments.getDocumentData(document.uri)?.notebook?.notebookType;
return score(typeConverters.LanguageSelector.from(selector), document.uri, document.languageId, true, notebookType);
},
registerCodeActionsProvider(selector: vscode.DocumentSelector, provider: vscode.CodeActionProvider, metadata?: vscode.CodeActionProviderMetadata): vscode.Disposable {
return extHostLanguageFeatures.registerCodeActionProvider(extension, checkSelector(selector), provider, metadata);

3
src/vs/workbench/api/common/extHostDocumentData.ts
View File

@@ -37,7 +37,7 @@ export class ExtHostDocumentData extends MirrorTextModel {
uri: URI, lines: string[], eol: string, versionId: number,
private _languageId: string,
private _isDirty: boolean,
private readonly _notebook?: vscode.NotebookDocument | undefined
public readonly notebook?: vscode.NotebookDocument | undefined
) {
super(uri, lines, eol, versionId);
}
@@ -66,7 +66,6 @@ export class ExtHostDocumentData extends MirrorTextModel {
get version() { return that._versionId; },
get isClosed() { return that._isDisposed; },
get isDirty() { return that._isDirty; },
get notebook() { return that._notebook; },
save() { return that._save(); },
getText(range?) { return range ? that._getTextInRange(range) : that.getText(); },
get eol() { return that._eol === '\n' ? EndOfLine.LF : EndOfLine.CRLF; },