ckaczor/azuredatastudio
1
0
Fork 0
mirror of https://github.com/ckaczor/azuredatastudio.git synced 2026-02-16 10:58:30 -05:00
Code Issues Packages Projects Releases Wiki Activity

Merge from vscode bd0efff9e3f36d6b3e1045cee9887003af8034d7

Browse Source
This commit is contained in:
ADS Merger
2020-05-06 02:35:49 +00:00
parent 9a7810cbee
commit 8420d9f04e
243 changed files with 4276 additions and 2478 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
extensions/configuration-editing/schemas/devContainer.schema.json
View File

@@ -282,33 +282,42 @@
]
}
},
"allOf": [
"oneOf": [
{
"oneOf": [
"allOf": [
{
"allOf": [
"oneOf": [
{
"oneOf": [
"allOf": [
{
"$ref": "#/definitions/dockerfileContainer"
"oneOf": [
{
"$ref": "#/definitions/dockerfileContainer"
},
{
"$ref": "#/definitions/imageContainer"
}
]
},
{
"$ref": "#/definitions/imageContainer"
"$ref": "#/definitions/nonComposeBase"
}
]
},
{
"$ref": "#/definitions/nonComposeBase"
"$ref": "#/definitions/composeContainer"
}
]
},
{
"$ref": "#/definitions/composeContainer"
"$ref": "#/definitions/devContainerCommon"
}
]
},
{
"$ref": "#/definitions/devContainerCommon"
"type": "object",
"$ref": "#/definitions/devContainerCommon",
"additionalProperties": false
}
]
}

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

@@ -133,7 +133,6 @@ export class MarkdownPreviewManager extends Disposable implements vscode.Webview
webview: vscode.WebviewPanel,
state: any
): Promise<void> {
console.log(state);
const resource = vscode.Uri.parse(state.resource);
const locked = state.locked;
const line = state.line;

2
extensions/package.json
View File

@@ -3,7 +3,7 @@
"version": "0.0.1",
"description": "Dependencies shared by all extensions",
"dependencies": {
"typescript": "3.8.3"
"typescript": "3.9.1-rc"
},
"scripts": {
"postinstall": "node ./postinstall"

8
extensions/yarn.lock
View File

@@ -2,7 +2,7 @@
# yarn lockfile v1
typescript@3.8.3:
version "3.8.3"
resolved "https://registry.yarnpkg.com/typescript/-/typescript-3.8.3.tgz#409eb8544ea0335711205869ec458ab109ee1061"
integrity sha512-MYlEfn5VrLNsgudQTVJeNaQFUAI7DkhnOjdpAp4T+ku1TfQClewlbSuTVHiA+8skNBgaf02TL/kLOvig4y3G8w==
typescript@3.9.1-rc:
version "3.9.1-rc"
resolved "https://registry.yarnpkg.com/typescript/-/typescript-3.9.1-rc.tgz#81d5a5a0a597e224b6e2af8dffb46524b2eaf5f3"
integrity sha512-+cPv8L2Vd4KidCotqi2wjegBZ5n47CDRUu/QiLVu2YbeXAz78hIfcai9ziBiNI6JTGTVwUqXRug2UZxDcxhvFw==