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 0a7364f00514c46c9caceece15e1f82f82e3712f

Browse Source
This commit is contained in:
ADS Merger
2020-07-22 03:06:57 +00:00
parent 53ec7585a9
commit 1b7b54ce14
229 changed files with 5099 additions and 3188 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
extensions/markdown-language-features/media/index.js
View File

File diff suppressed because one or more lines are too long

4
extensions/markdown-language-features/media/markdown.css
View File

@@ -131,6 +131,10 @@ p {
margin-bottom: 1.5em;
}
li > p {
margin-bottom: 0;
}
/* don't space 2 paragraphs too far apart */
p + p {
margin-top: -0.8em;

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

@@ -18,7 +18,13 @@ const settings = getSettings();
const vscode = acquireVsCodeApi();
const state = { ...vscode.getState(), ...getData<any>('data-state') };
const originalState = vscode.getState();
const state = {
...(typeof originalState === 'object' ? originalState : {}),
...getData<any>('data-state')
};
// Make sure to sync VS Code state here
vscode.setState(state);