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

extract MarkdownString from MarkedString type, fyi @mjvbz

Browse Source
This commit is contained in:
Johannes Rieken
2021-06-16 14:51:00 +02:00
parent a36051efae
commit b5da2d0f10
5 changed files with 14 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
extensions/npm/src/features/jsonContributions.ts
View File

@@ -10,7 +10,7 @@ import { XHRRequest } from 'request-light';
import {
CompletionItem, CompletionItemProvider, CompletionList, TextDocument, Position, Hover, HoverProvider,
CancellationToken, Range, MarkedString, DocumentSelector, languages, Disposable, Uri
CancellationToken, Range, DocumentSelector, languages, Disposable, Uri, MarkdownString
} from 'vscode';
export interface ISuggestionsCollector {
@@ -22,7 +22,7 @@ export interface ISuggestionsCollector {
export interface IJSONContribution {
getDocumentSelector(): DocumentSelector;
getInfoContribution(resourceUri: Uri, location: Location): Thenable<MarkedString[] | null> | null;
getInfoContribution(resourceUri: Uri, location: Location): Thenable<MarkdownString[] | null> | null;
collectPropertySuggestions(resourceUri: Uri, location: Location, currentWord: string, addValue: boolean, isLast: boolean, result: ISuggestionsCollector): Thenable<any> | null;
collectValueSuggestions(resourceUri: Uri, location: Location, result: ISuggestionsCollector): Thenable<any> | null;
collectDefaultSuggestions(resourceUri: Uri, result: ISuggestionsCollector): Thenable<any>;

4
extensions/npm/src/features/packageJSONContribution.ts
View File

@@ -3,7 +3,7 @@
* Licensed under the MIT License. See License.txt in the project root for license information.
*--------------------------------------------------------------------------------------------*/
import { MarkedString, CompletionItemKind, CompletionItem, DocumentSelector, SnippetString, workspace, MarkdownString, Uri } from 'vscode';
import { CompletionItemKind, CompletionItem, DocumentSelector, SnippetString, workspace, MarkdownString, Uri } from 'vscode';
import { IJSONContribution, ISuggestionsCollector } from './jsonContributions';
import { XHRRequest } from 'request-light';
import { Location } from 'jsonc-parser';
@@ -320,7 +320,7 @@ export class PackageJSONContribution implements IJSONContribution {
return undefined;
}
public getInfoContribution(resource: Uri, location: Location): Thenable<MarkedString[] | null> | null {
public getInfoContribution(resource: Uri, location: Location): Thenable<MarkdownString[] | null> | null {
if (!this.isEnabled()) {
return null;
}