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

Prevent Table from Disappearing due to exception when looking for tHead (#13680)

Browse Source 
* Prevent exception when tHead doesn't exist at node

* Add test for no thead
This commit is contained in:
Chris LaFreniere
2020-12-04 14:42:24 -08:00
committed by GitHub
parent 0c82024cf3
commit 6349f1bd49
2 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/sql/workbench/contrib/notebook/browser/turndownPluginGfm.ts
View File

@@ -99,12 +99,12 @@ rules['table'] = {
// Ensure there are no blank lines // Ensure there are no blank lines
content = content.replace('\n\n', '\n'); content = content.replace('\n\n', '\n');
// if the headings are empty, add border line and headings to keep table format // if the headings are empty, add border line and headings to keep table format
if (node.tHead.innerText === '') { if (node.tHead?.innerText === '') {
let emptyHeader = '\n\n|'; let emptyHeader = '\n\n|';
let border = '\n|'; let border = '\n|';
for (let i = 0; i < node.rows[0].childNodes.length; i++) { for (let i = 0; i < node.rows[0].childNodes.length; i++) {
emptyHeader += ' |'; emptyHeader += ' |';
border += ' --- |' border += ' --- |';
} }
return emptyHeader + border + content + '\n\n'; return emptyHeader + border + content + '\n\n';
} }

6
src/sql/workbench/contrib/notebook/test/browser/htmlMarkdownConverter.test.ts
View File

@@ -208,6 +208,12 @@ suite('HTML Markdown Converter', function (): void {
htmlString = '<table>\n<thead>\n<tr>\n<th>Test</th>\n<th>Test</th>\n<th>Test</th>\n</tr>\n</thead>\n<tbody><tr>\n<td>test</td>\n<td>test</td>\n<td>test</td>\n</tr>\n<tr>\n<td>test</td>\n<td>test</td>\n<td>test</td>\n</tr>\n<tr>\n<td>test</td>\n<td>test</td>\n<td>test</td>\n</tr>\n<tr>\n<td>test</td>\n<td>test</td>\n<td>test</td>\n</tr>\n</tbody></table>\n'; htmlString = '<table>\n<thead>\n<tr>\n<th>Test</th>\n<th>Test</th>\n<th>Test</th>\n</tr>\n</thead>\n<tbody><tr>\n<td>test</td>\n<td>test</td>\n<td>test</td>\n</tr>\n<tr>\n<td>test</td>\n<td>test</td>\n<td>test</td>\n</tr>\n<tr>\n<td>test</td>\n<td>test</td>\n<td>test</td>\n</tr>\n<tr>\n<td>test</td>\n<td>test</td>\n<td>test</td>\n</tr>\n</tbody></table>\n';
assert.equal(htmlMarkdownConverter.convert(htmlString), `| Test | Test | Test |\n| --- | --- | --- |\n| test | test | test |\n| test | test | test |\n| test | test | test |\n| test | test | test |`, 'Table with header failed'); assert.equal(htmlMarkdownConverter.convert(htmlString), `| Test | Test | Test |\n| --- | --- | --- |\n| test | test | test |\n| test | test | test |\n| test | test | test |\n| test | test | test |`, 'Table with header failed');
}); });
test('Should transform table with no thead', () => {
htmlString = '<table>\n<tr>\n<th>Test</th>\n<th>Test</th>\n<th>Test</th>\n</tr>\n<tbody><tr>\n<td>test</td>\n<td>test</td>\n<td>test</td>\n</tr>\n<tr>\n<td>test</td>\n<td>test</td>\n<td>test</td>\n</tr>\n<tr>\n<td>test</td>\n<td>test</td>\n<td>test</td>\n</tr>\n<tr>\n<td>test</td>\n<td>test</td>\n<td>test</td>\n</tr>\n</tbody></table>\n';
assert.equal(htmlMarkdownConverter.convert(htmlString), `| Test | Test | Test |\n| --- | --- | --- |\n| test | test | test |\n| test | test | test |\n| test | test | test |\n| test | test | test |`, 'Table with no thead failed');
});
test('Should transform <b> and <strong> tags', () => { test('Should transform <b> and <strong> tags', () => {
htmlString = '<b>test string</b>'; htmlString = '<b>test string</b>';
assert.equal(htmlMarkdownConverter.convert(htmlString), '**test string**', 'Basic bold test failed'); assert.equal(htmlMarkdownConverter.convert(htmlString), '**test string**', 'Basic bold test failed');