@@ -247,68 +247,38 @@ export function parseMarkup(sourceUri: vscode.Uri, sourceText: string) {
247247 const splits = m2 . split ( / [ | : ] / ) ;
248248 splits . forEach ( ( el : string ) => {
249249 const elems = el . split ( '=' ) ;
250- if ( elems [ 0 ] === "title" ) {
251- res = `<div><div class="${ panelClass } ${ panelClass } -title$iconlessFlag" $titleStyle>${ elems [ 1 ] } </div>${ res } ` ;
252- }
253- if ( elems [ 0 ] === "titleBGColor" ) {
254- if ( titleStyle . length === 0 ) {
255- titleStyle = `style='background-color: ${ elems [ 1 ] } ;` ;
256- } else {
257- titleStyle += ` background-color: ${ elems [ 1 ] } ;` ;
258- }
259- }
260- if ( elems [ 0 ] === "bgColor" ) {
261- if ( panelStyle . length === 0 ) {
262- panelStyle = `style='background-color: ${ elems [ 1 ] } ;` ;
263- } else {
264- panelStyle += ` background-color: ${ elems [ 1 ] } ;` ;
265- }
266- }
267- if ( elems [ 0 ] === "borderStyle" ) {
268- if ( panelStyle . length === 0 ) {
269- panelStyle = `style='border-style: ${ elems [ 1 ] } ; ` ;
270- } else {
271- panelStyle += ` border-style: ${ elems [ 1 ] } ; ` ;
272- }
273- if ( titleStyle . length === 0 ) {
274- titleStyle = `style='border-style: ${ elems [ 1 ] } ; border-bottom:none; ` ;
275- } else {
276- titleStyle += ` border-style: ${ elems [ 1 ] } ; border-bottom:none; ` ;
277- }
278- }
279- if ( elems [ 0 ] === "borderColor" ) {
280- if ( panelStyle . length === 0 ) {
281- panelStyle = `style='border-color: ${ elems [ 1 ] } ; ` ;
282- } else {
283- panelStyle += ` border-color: ${ elems [ 1 ] } ; ` ;
284- }
285- if ( titleStyle . length === 0 ) {
286- titleStyle = `style='border-color: ${ elems [ 1 ] } ; ` ;
287- } else {
288- titleStyle += ` border-color: ${ elems [ 1 ] } ; ` ;
289- }
290- }
291- if ( elems [ 0 ] === "borderWidth" ) {
292- if ( panelStyle . length === 0 ) {
293- panelStyle = `style='border-width: ${ elems [ 1 ] } ; ` ;
294- } else {
295- panelStyle += ` border-width: ${ elems [ 1 ] } ; ` ;
296- }
297- if ( titleStyle . length === 0 ) {
298- titleStyle = `style='border-width: ${ elems [ 1 ] } ; ` ;
299- } else {
300- titleStyle += ` border-width: ${ elems [ 1 ] } ; ` ;
301- }
302- }
303- if ( elems [ 0 ] === "icon" && elems [ 1 ] === "false" ) {
304- iconlessFlag = "-iconless" ;
250+ switch ( elems [ 0 ] ) {
251+ case "title" :
252+ res = `<div><div class="${ panelClass } ${ panelClass } -title$iconlessFlag" $titleStyle>${ elems [ 1 ] } </div>${ res } ` ;
253+ break ;
254+ case "titleBGColor" :
255+ titleStyle += `background-color: ${ elems [ 1 ] } ; ` ;
256+ break ;
257+ case "bgColor" :
258+ panelStyle += `background-color: ${ elems [ 1 ] } ; ` ;
259+ break ;
260+ case "borderStyle" :
261+ panelStyle += `border-style: ${ elems [ 1 ] } ; ` ;
262+ titleStyle += `border-style: ${ elems [ 1 ] } ; border-bottom:none; ` ;
263+ break ;
264+ case "borderColor" :
265+ panelStyle += `border-color: ${ elems [ 1 ] } ; ` ;
266+ titleStyle += `border-color: ${ elems [ 1 ] } ; ` ;
267+ break ;
268+ case "borderWidth" :
269+ panelStyle += `border-width: ${ elems [ 1 ] } ; ` ;
270+ titleStyle += `border-width: ${ elems [ 1 ] } ; ` ;
271+ break ;
272+ case "icon" :
273+ iconlessFlag = ( elems [ 1 ] === "false" ) ? "-iconless" : "" ;
274+ break ;
305275 }
306276 } ) ;
307277 if ( titleStyle . length > 0 ) {
308- titleStyle + = `'` ;
278+ titleStyle = `style=' ${ titleStyle . trim ( ) } '` ;
309279 }
310280 if ( panelStyle . length > 0 ) {
311- panelStyle + = `'` ;
281+ panelStyle = `style=' ${ panelStyle . trim ( ) } '` ;
312282 }
313283 if ( panelClass != 'panel' ) {
314284 panelStyle = "" ;
0 commit comments