ckaczor/azuredatastudio
1
0
Fork 0
mirror of https://github.com/ckaczor/azuredatastudio.git synced 2026-01-24 17:23:05 -05:00
Code Issues Packages Projects Releases Wiki Activity

Merge from vscode aba87f135229c17c4624341b7a2499dcedafcb87 (#6430)

Browse Source 
* Merge from vscode aba87f135229c17c4624341b7a2499dcedafcb87

* fix compile errors
This commit is contained in:
Anthony Dresser
2019-07-18 18:32:57 -07:00
committed by GitHub
parent bf4815d364
commit ee3663c1cd
158 changed files with 3101 additions and 2361 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
extensions/markdown-language-features/src/features/preview.ts
View File

@@ -102,11 +102,13 @@ export class MarkdownPreview extends Disposable {
const resource = vscode.Uri.parse(state.resource);
const locked = state.locked;
const line = state.line;
const resourceColumn = state.resourceColumn;
const preview = new MarkdownPreview(
webview,
resource,
locked,
resourceColumn,
contentProvider,
previewConfigurations,
logger,
@@ -125,6 +127,7 @@ export class MarkdownPreview extends Disposable {
public static create(
resource: vscode.Uri,
previewColumn: vscode.ViewColumn,
resourceColumn: vscode.ViewColumn,
locked: boolean,
contentProvider: MarkdownContentProvider,
previewConfigurations: MarkdownPreviewConfigurationManager,
@@ -144,6 +147,7 @@ export class MarkdownPreview extends Disposable {
webview,
resource,
locked,
resourceColumn,
contentProvider,
previewConfigurations,
logger,
@@ -155,6 +159,7 @@ export class MarkdownPreview extends Disposable {
webview: vscode.WebviewPanel,
resource: vscode.Uri,
locked: boolean,
private readonly _resourceColumn: vscode.ViewColumn,
private readonly _contentProvider: MarkdownContentProvider,
private readonly _previewConfigurations: MarkdownPreviewConfigurationManager,
private readonly _logger: Logger,
@@ -249,11 +254,16 @@ export class MarkdownPreview extends Disposable {
return this._resource;
}
public get resourceColumn(): vscode.ViewColumn {
return this._resourceColumn;
}
public get state() {
return {
resource: this.resource.toString(),
locked: this._locked,
line: this.line,
resourceColumn: this.resourceColumn,
imageInfo: this.imageInfo
};
}

5
extensions/markdown-language-features/src/features/previewManager.ts
View File

@@ -65,6 +65,10 @@ export class MarkdownPreviewManager extends Disposable implements vscode.Webview
return this._activePreview && this._activePreview.resource;
}
public get activePreviewResourceColumn() {
return this._activePreview && this._activePreview.resourceColumn;
}
public toggleLock() {
const preview = this._activePreview;
if (preview) {
@@ -110,6 +114,7 @@ export class MarkdownPreviewManager extends Disposable implements vscode.Webview
const preview = MarkdownPreview.create(
resource,
previewSettings.previewColumn,
previewSettings.resourceColumn,
previewSettings.locked,
this._contentProvider,
this._previewConfigurations,