Skip to content

Commit 2bee2bd

Browse files
mikeebowenmikeebowen
authored
Merge pull request #3 from mikeebowen/dev
Dev
2 parents c01b07f + bff54e1 commit 2bee2bd

File tree

8 files changed

+111
-56
lines changed

8 files changed

+111
-56
lines changed

‎CHANGELOG.md‎

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,18 @@ All notable changes to this project will be documented in this file.
55
The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/)
66
and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html).
77

8-
## [1.0.0] - 2021-09-01
8+
## [1.0.1] - 2021-09-03
99

10-
Initial release of OOXML Validator
10+
### Fixed
11+
12+
- Display correct error message when dotnet runtime extension is missing [#2](https://github.com/mikeebowen/ooxml-validator-vscode/issues/2)
13+
14+
### Added
15+
16+
- Updated README badges
17+
- Created my free logo at [LogoMakr.com](https://logomakr.com/).
18+
19+
## [1.0.0] - 2021-09-02
1120

1221
### Added
1322

‎README.md‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1+
[![Visual Studio Marketplace](https://vsmarketplacebadge.apphb.com/version-short/mikeebowen.ooxml-validator-vscode.svg)](https://marketplace.visualstudio.com/items?itemName=mikeebowen.ooxml-validator-vscode)
12
[![Unit Tests](https://github.com/mikeebowen/ooxml-validator-vscode/actions/workflows/main.yml/badge.svg)](https://github.com/mikeebowen/ooxml-validator-vscode/actions/workflows/main.yml)
23
[![Coverage Status](https://coveralls.io/repos/github/mikeebowen/ooxml-validator-vscode/badge.svg?branch=main)](https://coveralls.io/github/mikeebowen/ooxml-validator-vscode?branch=main)
3-
![GitHub release (latest by date)](https://img.shields.io/github/v/release/mikeebowen/ooxml-validator-vscode)
4-
![GitHub](https://img.shields.io/github/license/mikeebowen/ooxml-validator-vscode?label=license)
4+
[![Project License](https://img.shields.io/github/license/mikeebowen/ooxml-validator-vscode?label=license)](https://github.com/mikeebowen/ooxml-validator-vscode/blob/main/LICENSE)
55

66
# OOXML Validator VSCode Extension
77

‎coverage/lcov-report/index.html‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -25,28 +25,28 @@ <h1>All files</h1>
2525
<div class='fl pad1y space-right2'>
2626
<span class="strong">100% </span>
2727
<span class="quiet">Statements</span>
28-
<span class='fraction'>94/94</span>
28+
<span class='fraction'>99/99</span>
2929
</div>
3030

3131

3232
<div class='fl pad1y space-right2'>
33-
<span class="strong">87.23% </span>
33+
<span class="strong">88.04% </span>
3434
<span class="quiet">Branches</span>
35-
<span class='fraction'>82/94</span>
35+
<span class='fraction'>81/92</span>
3636
</div>
3737

3838

3939
<div class='fl pad1y space-right2'>
4040
<span class="strong">100% </span>
4141
<span class="quiet">Functions</span>
42-
<span class='fraction'>12/12</span>
42+
<span class='fraction'>13/13</span>
4343
</div>
4444

4545

4646
<div class='fl pad1y space-right2'>
4747
<span class="strong">100% </span>
4848
<span class="quiet">Lines</span>
49-
<span class='fraction'>91/91</span>
49+
<span class='fraction'>96/96</span>
5050
</div>
5151

5252

@@ -78,13 +78,13 @@ <h1>All files</h1>
7878
<div class="chart"><div class="cover-fill cover-full" style="width: 100%"></div><div class="cover-empty" style="width: 0%"></div></div>
7979
</td>
8080
<td data-value="100" class="pct high">100%</td>
81-
<td data-value="94" class="abs high">94/94</td>
82-
<td data-value="87.23" class="pct high">87.23%</td>
83-
<td data-value="94" class="abs high">82/94</td>
81+
<td data-value="99" class="abs high">99/99</td>
82+
<td data-value="88.04" class="pct high">88.04%</td>
83+
<td data-value="92" class="abs high">81/92</td>
8484
<td data-value="100" class="pct high">100%</td>
85-
<td data-value="12" class="abs high">12/12</td>
85+
<td data-value="13" class="abs high">13/13</td>
8686
<td data-value="100" class="pct high">100%</td>
87-
<td data-value="91" class="abs high">91/91</td>
87+
<td data-value="96" class="abs high">96/96</td>
8888
</tr>
8989

9090
</tbody>
@@ -95,7 +95,7 @@ <h1>All files</h1>
9595
<div class='footer quiet pad2 space-top1 center small'>
9696
Code coverage generated by
9797
<a href="https://istanbul.js.org/" target="_blank">istanbul</a>
98-
at Thu Sep 02 2021 09:05:40 GMT-0700 (Pacific Daylight Time)
98+
at Fri Sep 03 2021 11:06:49 GMT-0700 (Pacific Daylight Time)
9999
</div>
100100
</div>
101101
<script src="prettify.js"></script>

‎coverage/lcov-report/ooxml-validator.ts.html‎

Lines changed: 43 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -25,28 +25,28 @@ <h1><a href="index.html">All files</a> ooxml-validator.ts</h1>
2525
<div class='fl pad1y space-right2'>
2626
<span class="strong">100% </span>
2727
<span class="quiet">Statements</span>
28-
<span class='fraction'>94/94</span>
28+
<span class='fraction'>99/99</span>
2929
</div>
3030

3131

3232
<div class='fl pad1y space-right2'>
33-
<span class="strong">87.23% </span>
33+
<span class="strong">88.04% </span>
3434
<span class="quiet">Branches</span>
35-
<span class='fraction'>82/94</span>
35+
<span class='fraction'>81/92</span>
3636
</div>
3737

3838

3939
<div class='fl pad1y space-right2'>
4040
<span class="strong">100% </span>
4141
<span class="quiet">Functions</span>
42-
<span class='fraction'>12/12</span>
42+
<span class='fraction'>13/13</span>
4343
</div>
4444

4545

4646
<div class='fl pad1y space-right2'>
4747
<span class="strong">100% </span>
4848
<span class="quiet">Lines</span>
49-
<span class='fraction'>91/91</span>
49+
<span class='fraction'>96/96</span>
5050
</div>
5151

5252

@@ -450,7 +450,18 @@ <h1><a href="index.html">All files</a> ooxml-validator.ts</h1>
450450
<a name='L391'></a><a href='#L391'>391</a>
451451
<a name='L392'></a><a href='#L392'>392</a>
452452
<a name='L393'></a><a href='#L393'>393</a>
453-
<a name='L394'></a><a href='#L394'>394</a></td><td class="line-coverage quiet"><span class="cline-any cline-neutral">&nbsp;</span>
453+
<a name='L394'></a><a href='#L394'>394</a>
454+
<a name='L395'></a><a href='#L395'>395</a>
455+
<a name='L396'></a><a href='#L396'>396</a>
456+
<a name='L397'></a><a href='#L397'>397</a>
457+
<a name='L398'></a><a href='#L398'>398</a>
458+
<a name='L399'></a><a href='#L399'>399</a>
459+
<a name='L400'></a><a href='#L400'>400</a>
460+
<a name='L401'></a><a href='#L401'>401</a>
461+
<a name='L402'></a><a href='#L402'>402</a>
462+
<a name='L403'></a><a href='#L403'>403</a>
463+
<a name='L404'></a><a href='#L404'>404</a>
464+
<a name='L405'></a><a href='#L405'>405</a></td><td class="line-coverage quiet"><span class="cline-any cline-neutral">&nbsp;</span>
454465
<span class="cline-any cline-yes">1x</span>
455466
<span class="cline-any cline-yes">1x</span>
456467
<span class="cline-any cline-yes">1x</span>
@@ -837,6 +848,17 @@ <h1><a href="index.html">All files</a> ooxml-validator.ts</h1>
837848
<span class="cline-any cline-neutral">&nbsp;</span>
838849
<span class="cline-any cline-yes">4x</span>
839850
<span class="cline-any cline-neutral">&nbsp;</span>
851+
<span class="cline-any cline-yes">4x</span>
852+
<span class="cline-any cline-yes">2x</span>
853+
<span class="cline-any cline-yes">2x</span>
854+
<span class="cline-any cline-neutral">&nbsp;</span>
855+
<span class="cline-any cline-neutral">&nbsp;</span>
856+
<span class="cline-any cline-neutral">&nbsp;</span>
857+
<span class="cline-any cline-yes">1x</span>
858+
<span class="cline-any cline-neutral">&nbsp;</span>
859+
<span class="cline-any cline-yes">1x</span>
860+
<span class="cline-any cline-neutral">&nbsp;</span>
861+
<span class="cline-any cline-neutral">&nbsp;</span>
840862
<span class="cline-any cline-neutral">&nbsp;</span>
841863
<span class="cline-any cline-yes">4x</span>
842864
<span class="cline-any cline-yes">4x</span>
@@ -1228,9 +1250,20 @@ <h1><a href="index.html">All files</a> ooxml-validator.ts</h1>
12281250
panel.webview.html = content;
12291251
}
12301252
} catch (error: any) {
1231-
const errMsg = error<span class="branch-0 cbranch-no" title="branch not covered" >?.n</span>ame?.includes('dotnet.')
1232-
? 'The ".NET Install Tool for Extension Authors" VS Code extension\nMUST be installed for the OOXML Validator extension to work.'
1233-
: error.message || error;
1253+
let errMsg = error.message || error;
1254+
&nbsp;
1255+
Object.values(error).some((e: any) =&gt; {
1256+
const str = e.toString &amp;&amp; e.toString();
1257+
if (
1258+
str &amp;&amp;
1259+
(str.includes('dotnet.showAcquisitionLog') || str.includes('dotnet.ensureDotnetDependencies') || str.includes('dotnet.acquire'))
1260+
) {
1261+
errMsg =
1262+
'The ".NET Install Tool for Extension Authors" VS Code extension\nMUST be installed for the OOXML Validator extension to work.';
1263+
return true;
1264+
}
1265+
});
1266+
&nbsp;
12341267
panel<span class="branch-0 cbranch-no" title="branch not covered" >?.d</span>ispose();
12351268
await window.showErrorMessage(errMsg, { modal: true });
12361269
}
@@ -1243,7 +1276,7 @@ <h1><a href="index.html">All files</a> ooxml-validator.ts</h1>
12431276
<div class='footer quiet pad2 space-top1 center small'>
12441277
Code coverage generated by
12451278
<a href="https://istanbul.js.org/" target="_blank">istanbul</a>
1246-
at Thu Sep 02 2021 09:05:40 GMT-0700 (Pacific Daylight Time)
1279+
at Fri Sep 03 2021 11:06:49 GMT-0700 (Pacific Daylight Time)
12471280
</div>
12481281
</div>
12491282
<script src="prettify.js"></script>

‎coverage/lcov.info‎

Lines changed: 29 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,9 @@ FN:123,(anonymous_15)
1212
FN:322,(anonymous_16)
1313
FN:322,(anonymous_17)
1414
FN:370,(anonymous_18)
15-
FNF:12
16-
FNH:12
15+
FN:388,(anonymous_19)
16+
FNF:13
17+
FNH:13
1718
FNDA:18,(anonymous_7)
1819
FNDA:7,(anonymous_8)
1920
FNDA:3,(anonymous_9)
@@ -26,6 +27,7 @@ FNDA:4,(anonymous_15)
2627
FNDA:8,(anonymous_16)
2728
FNDA:8,(anonymous_17)
2829
FNDA:6,(anonymous_18)
30+
FNDA:2,(anonymous_19)
2931
DA:2,1
3032
DA:3,1
3133
DA:4,1
@@ -115,10 +117,15 @@ DA:380,2
115117
DA:382,1
116118
DA:383,1
117119
DA:386,4
118-
DA:389,4
119-
DA:390,4
120-
LF:91
121-
LH:91
120+
DA:388,4
121+
DA:389,2
122+
DA:390,2
123+
DA:394,1
124+
DA:396,1
125+
DA:400,4
126+
DA:401,4
127+
LF:96
128+
LH:96
122129
BRDA:33,0,0,8
123130
BRDA:33,0,1,10
124131
BRDA:33,1,0,18
@@ -197,22 +204,20 @@ BRDA:373,37,0,2
197204
BRDA:373,37,1,1
198205
BRDA:376,38,0,1
199206
BRDA:376,38,1,1
200-
BRDA:387,39,0,1
201-
BRDA:387,39,1,3
202-
BRDA:386,40,0,1
203-
BRDA:386,40,1,3
204-
BRDA:386,41,0,4
205-
BRDA:386,41,1,4
206-
BRDA:386,42,0,0
207-
BRDA:386,42,1,4
208-
BRDA:386,43,0,4
209-
BRDA:386,43,1,4
210-
BRDA:388,44,0,3
211-
BRDA:388,44,1,1
212-
BRDA:389,45,0,0
213-
BRDA:389,45,1,4
214-
BRDA:389,46,0,4
215-
BRDA:389,46,1,4
216-
BRF:94
217-
BRH:82
207+
BRDA:386,39,0,4
208+
BRDA:386,39,1,2
209+
BRDA:389,40,0,2
210+
BRDA:389,40,1,2
211+
BRDA:390,41,0,1
212+
BRDA:390,41,1,1
213+
BRDA:391,42,0,2
214+
BRDA:391,42,1,2
215+
BRDA:391,42,2,1
216+
BRDA:391,42,3,1
217+
BRDA:400,43,0,0
218+
BRDA:400,43,1,4
219+
BRDA:400,44,0,4
220+
BRDA:400,44,1,4
221+
BRF:92
222+
BRH:81
218223
end_of_record

‎package-lock.json‎

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎package.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
"displayName": "OOXML Validator",
44
"description": "A VS Code extension to validate Office Open XML files (.docx, .xlsx, and .pptx)",
55
"icon": "assets/icon.png",
6-
"version": "1.0.0",
6+
"version": "1.0.1",
77
"publisher": "mikeebowen",
88
"homepage": "https://github.com/mikeebowen/ooxml-validator-vscode/blob/master/README.md",
99
"repository": {
@@ -128,4 +128,4 @@
128128
"dependencies": {
129129
"csv-writer": "^1.6.0"
130130
}
131-
}
131+
}

‎src/ooxml-validator.ts‎

Lines changed: 11 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -383,9 +383,17 @@ export default class OOXMLValidator {
383383
panel.webview.html = content;
384384
}
385385
} catch (error: any) {
386-
const errMsg = error?.name?.includes('dotnet.')
387-
? 'The ".NET Install Tool for Extension Authors" VS Code extension\nMUST be installed for the OOXML Validator extension to work.'
388-
: error.message || error;
386+
let errMsg = error.message || error;
387+
388+
Object.values(error).some((e: any) => {
389+
const str = e.toString && e.toString();
390+
if (str && str.includes('dotnet.')) {
391+
errMsg =
392+
'The ".NET Install Tool for Extension Authors" VS Code extension\nMUST be installed for the OOXML Validator extension to work.';
393+
return true;
394+
}
395+
});
396+
389397
panel?.dispose();
390398
await window.showErrorMessage(errMsg, { modal: true });
391399
}

0 commit comments

Comments
 (0)