isCont types + lineInfo.scope + lineInfo.line

aminya · aminya · commit 8d42c5b2943d · 2020-04-13T11:06:55.000-05:00
diff --git a/lib_src/misc/blocks.ts b/lib_src/misc/blocks.ts
@@ -37,13 +37,13 @@ function isStringEnd(lineInfo: LineInfo) {
   const scope = lineInfo.scope.join(" ")
   return /\bstring\.multiline\.end\b/.test(scope) || (/\bstring\.end\b/.test(scope) && /\bbacktick\b/.test(scope))
 }
-function isCont({ line, scope }) {
-  scope = scope.join(" ")
+function isCont(lineInfo: LineInfo) {
+  const scope = lineInfo.scope.join(" ")
   if (/\bstring\b/.test(scope) && !/\bpunctuation\.definition\.string\b/.test(scope)) {
     return true
   }
 
-  return line.match(/^(else|elseif|catch|finally)\b/)
+  return lineInfo.line.match(/^(else|elseif|catch|finally)\b/)
 }
 function isStart(lineInfo) {
   return !(/^\s/.test(lineInfo.line) || isBlank(lineInfo) || isEnd(lineInfo) || isCont(lineInfo))

Original file line number	Diff line number	Diff line change
`@@ -37,13 +37,13 @@ function isStringEnd(lineInfo: LineInfo) {`
`37`	`37`	`const scope = lineInfo.scope.join(" ")`
`38`	`38`	`return /\bstring\.multiline\.end\b/.test(scope) \|\| (/\bstring\.end\b/.test(scope) && /\bbacktick\b/.test(scope))`
`39`	`39`	`}`
`40`		`-function isCont({ line, scope }) {`
`41`		`- scope = scope.join(" ")`
	`40`	`+function isCont(lineInfo: LineInfo) {`
	`41`	`+ const scope = lineInfo.scope.join(" ")`
`42`	`42`	`if (/\bstring\b/.test(scope) && !/\bpunctuation\.definition\.string\b/.test(scope)) {`
`43`	`43`	`return true`
`44`	`44`	`}`
`45`	`45`
`46`		`- return line.match(/^(else\|elseif\|catch\|finally)\b/)`
	`46`	`+ return lineInfo.line.match(/^(else\|elseif\|catch\|finally)\b/)`
`47`	`47`	`}`
`48`	`48`	`function isStart(lineInfo) {`
`49`	`49`	`return !(/^\s/.test(lineInfo.line) \|\| isBlank(lineInfo) \|\| isEnd(lineInfo) \|\| isCont(lineInfo))`