mincomk/risuai
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: add null checking

Browse Source
This commit is contained in:
kwaroran
2024-06-19 03:20:54 +09:00
parent 507c3e629a
commit c2eb8c6419
1 changed files with 17 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
src/ts/plugins/automark.ts
View File

@@ -27,8 +27,13 @@ export function risuFormater(dat:string){
let htmlType = 0 // 0: not inside tag, 1: closing tag, 2: opening tag let htmlType = 0 // 0: not inside tag, 1: closing tag, 2: opening tag
for(let i=0;i<dat.length;i++){ for(let i=0;i<dat.length;i++){
const getLastLine = () => {
return lines[lines.length-1] ?? [
'not-found', ''
]
}
//html tag handling //html tag handling
if(dat[i] === '<' && lines[lines.length-1][0] !== 'code-block'){ if(dat[i] === '<' && getLastLine()[0] !== 'code-block'){
lines.push(['html-tag','']) lines.push(['html-tag',''])
if(dat[i+1] === '/'){ if(dat[i+1] === '/'){
htmlType = 1 htmlType = 1
@@ -38,29 +43,29 @@ export function risuFormater(dat:string){
} }
} }
if(dat[i] === '>' && lines[lines.length-1][0] === 'html-tag'){ if(dat[i] === '>' && getLastLine()[0] === 'html-tag'){
const pop = lines.pop() const pop = lines.pop()
const tagAttr = pop[1].substring(1).trim() const tagAttr = pop[1].substring(1).trim()
if(htmlType === 1){ if(htmlType === 1){
const pop2 = lines.pop() //probably html-inner const pop2 = lines.pop() //probably html-inner
const chunk = pop2[1] + pop[1] + '>' const chunk = pop2[1] + pop[1] + '>'
if(lines[lines.length-1][0] === ''){ if(getLastLine()[0] === ''){
lines.push(['html-chunk',chunk]) lines.push(['html-chunk',chunk])
lines.push(['','']) lines.push(['',''])
} }
else{ else{
lines[lines.length-1][1] += chunk getLastLine()[1] += chunk
} }
continue continue
} }
else if(checkSelfClosingTag(tagAttr)){ else if(checkSelfClosingTag(tagAttr)){
const chunk = pop[1] + '>' const chunk = pop[1] + '>'
if(lines[lines.length-1][0] === ''){ if(getLastLine()[0] === ''){
lines.push(['html-chunk',chunk]) lines.push(['html-chunk',chunk])
lines.push(['','']) lines.push(['',''])
} }
else{ else{
lines[lines.length-1][1] += chunk getLastLine()[1] += chunk
} }
continue continue
} }
@@ -72,9 +77,9 @@ export function risuFormater(dat:string){
//code block handling //code block handling
if(dat[i] === '`' && dat[i+1] === '`' && dat[i+2] === '`' && lines[lines.length-1][0] === ''){ if(dat[i] === '`' && dat[i+1] === '`' && dat[i+2] === '`' && getLastLine()[0] === ''){
if(lines[lines.length-1][0] === 'code-block'){ if(getLastLine()[0] === 'code-block'){
lines[lines.length-1][1] += '```' getLastLine()[1] += '```'
lines.push(['','']) lines.push(['',''])
} }
else{ else{
@@ -85,11 +90,11 @@ export function risuFormater(dat:string){
} }
if(dat[i] === '\n' && lines[lines.length-1][0] === ''){ if(dat[i] === '\n' && getLastLine()[0] === ''){
lines.push(['newline','\n']) lines.push(['newline','\n'])
lines.push(['','']) lines.push(['',''])
} }
else{ else if(lines[lines.length-1]){
lines[lines.length-1][1] += dat[i] lines[lines.length-1][1] += dat[i]
} }
} }
@@ -101,7 +106,7 @@ export function risuFormater(dat:string){
continue continue
} }
let line = lines[i][1] let line = lines[i][1] ??''
let isNumbered = false let isNumbered = false
let endMarked = false let endMarked = false
if(excludesDat.includes(line[0]) || (line[1] === '.' && ['1','2','3','4','5','6','7','8','9'].includes(line[0]))){ if(excludesDat.includes(line[0]) || (line[1] === '.' && ['1','2','3','4','5','6','7','8','9'].includes(line[0]))){