Revert "Merge from vscode 81d7885dc2e9dc617e1522697a2966bc4025a45d (#5949)" (#5983)

This reverts commit d15a3fcc98.
This commit is contained in:
Karl Burtram
2019-06-11 12:35:58 -07:00
committed by GitHub
parent 95a50b7892
commit 5a7562a37b
926 changed files with 11394 additions and 19540 deletions

32
src/vs/vscode.d.ts vendored
View File

@@ -1101,7 +1101,7 @@ declare module 'vscode' {
/**
* The column in which this editor shows. Will be `undefined` in case this
* isn't one of the main editors, e.g. an embedded editor, or when the editor
* isn't one of the main editors, e.g an embedded editor, or when the editor
* column is larger than three.
*/
viewColumn?: ViewColumn;
@@ -1900,7 +1900,7 @@ declare module 'vscode' {
*
* *Note* that a document selector that is just a language identifier selects *all*
* documents, even those that are not saved on disk. Only use such selectors when
* a feature works without further context, e.g. without the need to resolve related
* a feature works without further context, e.g without the need to resolve related
* 'files'.
*
* @sample `let sel:DocumentSelector = { scheme: 'file', language: 'typescript' }`;
@@ -2595,7 +2595,7 @@ declare module 'vscode' {
name: string;
/**
* More detail for this symbol, e.g. the signature of a function.
* More detail for this symbol, e.g the signature of a function.
*/
detail: string;
@@ -2605,12 +2605,12 @@ declare module 'vscode' {
kind: SymbolKind;
/**
* The range enclosing this symbol not including leading/trailing whitespace but everything else, e.g. comments and code.
* The range enclosing this symbol not including leading/trailing whitespace but everything else, e.g comments and code.
*/
range: Range;
/**
* The range that should be selected and reveal when this symbol is being picked, e.g. the name of a function.
* The range that should be selected and reveal when this symbol is being picked, e.g the name of a function.
* Must be contained by the [`range`](#DocumentSymbol.range).
*/
selectionRange: Range;
@@ -3515,10 +3515,6 @@ declare module 'vscode' {
*
* The editor will only resolve a completion item once.
*
* *Note* that accepting a completion item will not wait for it to be resolved. Because of that [`insertText`](#CompletionItem.insertText),
* [`additionalTextEdits`](#CompletionItem.additionalTextEdits), and [`command`](#CompletionItem.command) should not
* be changed when resolving an item.
*
* @param item A completion item currently active in the UI.
* @param token A cancellation token.
* @return The resolved completion item or a thenable that resolves to of such. It is OK to return the given
@@ -3649,7 +3645,7 @@ declare module 'vscode' {
*
* For some languages one color can have multiple presentations, e.g. css can represent the color red with
* the constant `Red`, the hex-value `#ff0000`, or in rgba and hsla forms. In csharp other representations
* apply, e.g. `System.Drawing.Color.Red`.
* apply, e.g `System.Drawing.Color.Red`.
*/
export class ColorPresentation {
@@ -4235,7 +4231,7 @@ declare module 'vscode' {
/**
* Represents a related message and source code location for a diagnostic. This should be
* used to point to code locations that cause or related to a diagnostics, e.g. when duplicating
* used to point to code locations that cause or related to a diagnostics, e.g when duplicating
* a symbol in a scope.
*/
export class DiagnosticRelatedInformation {
@@ -6680,7 +6676,7 @@ declare module 'vscode' {
* the following rules:
*
* - The uri-scheme must be `vscode.env.uriScheme`;
* - The uri-authority must be the extension id (e.g. `my.extension`);
* - The uri-authority must be the extension id (eg. `my.extension`);
* - The uri-path, -query and -fragment parts are arbitrary.
*
* For example, if the `my.extension` extension registers a uri handler, it will only
@@ -8421,9 +8417,9 @@ declare module 'vscode' {
/**
* Creates a new [source control](#SourceControl) instance.
*
* @param id An `id` for the source control. Something short, e.g.: `git`.
* @param label A human-readable string for the source control. E.g.: `Git`.
* @param rootUri An optional Uri of the root of the source control. E.g.: `Uri.parse(workspaceRoot)`.
* @param id An `id` for the source control. Something short, eg: `git`.
* @param label A human-readable string for the source control. Eg: `Git`.
* @param rootUri An optional Uri of the root of the source control. Eg: `Uri.parse(workspaceRoot)`.
* @return An instance of [source control](#SourceControl).
*/
export function createSourceControl(id: string, label: string, rootUri?: Uri): SourceControl;
@@ -8987,7 +8983,7 @@ declare module 'vscode' {
/**
* The uri of the document the thread has been created on.
*/
readonly uri: Uri;
readonly resource: Uri;
/**
* The range the comment thread is located within the document. The thread icon will be shown
@@ -9101,7 +9097,7 @@ declare module 'vscode' {
}
/**
* Command argument for actions registered in `comments/commentThread/context`.
* Command argument for actions registered in `comments/commentThread/actions`.
*/
export interface CommentReply {
/**
@@ -9151,7 +9147,7 @@ declare module 'vscode' {
* Create a [comment thread](#CommentThread). The comment thread will be displayed in visible text editors (if the resource matches)
* and Comments Panel once created.
*
* @param uri The uri of the document the thread has been created on.
* @param resource The uri of the document the thread has been created on.
* @param range The range the comment thread is located within the document.
* @param comments The ordered comments of the thread.
*/