'concat no whiteSpace': thisE.text = ' '; example: v:="str"var -> `…

…v:="str" var`; #19; githubPages
FuPeiJiang · Jul 25, 2021 · a050bee · a050bee
1 parent 1db0c6b
commit a050bee
Show file tree

Hide file tree

Showing 7 changed files with 26 additions and 12 deletions.
diff --git a/docs/ahkParser.js b/docs/ahkParser.js
diff --git a/docs/modifyEverythingToV2.js b/docs/modifyEverythingToV2.js
diff --git a/mocha/test.ts b/mocha/test.ts
@@ -42,6 +42,7 @@ describe('toV2(text)',function() {
       ,String.raw`SQLiteDLL:=IniRead(A_ScriptDir "\SQLiteDB.ini","Main","DllPath",SQLiteDLL ); old`)
   })
   doIt('WinGetTitle, OutputVar, A','OutputVar:=WinGetTitle("A")')
+  doIt('v:=spr " h"ySep " w"3*xSep " v" "t_" c "_" r','v:=spr " h" ySep " w" 3*xSep " v" "t_" c "_" r')
 
 })
 

diff --git a/src/convertTov2.ts b/src/convertTov2.ts
@@ -4,8 +4,8 @@ import modifyEverythingToV2 from './modifyEverythingToV2'
 
 
 const content: Buffer =
-fs.readFileSync('v2tests/hotkey return to brackets.ahk')
-// fs.readFileSync('tests3/SplashyTest gui add.ahk')
+// fs.readFileSync('v2tests/hotkey return to brackets.ahk')
+fs.readFileSync('tests3/SplashyTest gui add.ahk')
 // fs.readFileSync('v2tests/IniRead.ahk')
 // fs.readFileSync('tests3/new class.ahk')
 // fs.readFileSync('tests3/Incorrect quoting of parameters #6.ahk')

diff --git a/src/modifyEverythingToV2.ts b/src/modifyEverythingToV2.ts
@@ -494,6 +494,8 @@ export default (everything: ExtendedEverythingType,is_AHK_H = true): string => {
       //and to not skip the '%START %Var%'
     } else if (eType === 'String') {
       thisE.text = `"${thisE.text.slice(1,-1).replace(/""/g,'`"')}"`
+    } else if (eType === 'concat no whiteSpace') {
+      thisE.text = ' '
     } else if (anyCommand[eType]) {
       //if breakOrContinue, if is number, don't surround with quotes
       switch (thisE.text.toLowerCase()) {

diff --git a/src/parser/index.ts b/src/parser/index.ts
@@ -2167,13 +2167,21 @@ export default (content: string,literalDoubleQuoteInContinuation = false): Every
     //if the next thing is expr, it is a concat
     // if char before is whiteSpace concat
     const everythingConcatIndex = everything.length - 1
-    if (i === lineWhereCanConcat && whiteSpaceObj[lines[i][c - 1]] && findExpression()) {
-      // const concatWhiteSpaces = lines[concatLineBak].slice(beforeConcatBak, afterConcat)
-      // d(`concat "${concatWhiteSpaces}" ${concatWhiteSpaces.length}LENGHT ${beforeConcatBak + 1} line ${concatLineBak + 1}`)
-      // I just have to replace the last whiteSpace with concat
-      everything[everythingConcatIndex].type = 'concat'
-      // everything.push({type: 'concat', text:concatWhiteSpaces,i1: concatLineBak, c1: beforeConcatBak,c2:afterConcat})
-      return true
+    if (i === lineWhereCanConcat) {
+      if (whiteSpaceObj[lines[i][c - 1]] && findExpression()) {
+        everything[everythingConcatIndex].type = 'concat'
+        // const concatWhiteSpaces = lines[concatLineBak].slice(beforeConcatBak, afterConcat)
+        // d(`concat "${concatWhiteSpaces}" ${concatWhiteSpaces.length}LENGHT ${beforeConcatBak + 1} line ${concatLineBak + 1}`)
+        // I just have to replace the last whiteSpace with concat
+        // everything.push({type: 'concat', text:concatWhiteSpaces,i1: concatLineBak, c1: beforeConcatBak,c2:afterConcat})
+        return false
+      } else if (everything[everythingConcatIndex].type === 'String') {
+        const iBak = i,cBak = c
+        if (findExpression()) {
+          everything.splice(everythingConcatIndex + 1,0,{type:'concat no whiteSpace',text:'',i1:iBak,c1:cBak,c2:cBak})
+          return false
+        }
+      }
     }
 
     if (insideContinuation) {

diff --git a/tests3/SplashyTest gui add.ahk b/tests3/SplashyTest gui add.ahk
@@ -1,2 +1,5 @@
+; v:="str"3
+; v:=var "str"var
+; v:="str"var
+v:=spr " h"ySep " w"3*xSep " v" "t_" c "_" r
 ; gui, Test: add, text, % spr " h"ySep " w"3*xSep " v" "t_" c "_" r
-v:=spr " h"ySep " w"3*xSep " v" "t_" c "_" r
-Original file line number
+Diff line change
@@ Expand Up / @@ -42,6 +42,7 @@ describe('toV2(text)',function() { @@
           ,String.raw`SQLiteDLL:=IniRead(A_ScriptDir "\SQLiteDB.ini","Main","DllPath",SQLiteDLL ); old`)
       })
       doIt('WinGetTitle, OutputVar, A','OutputVar:=WinGetTitle("A")')
+      doIt('v:=spr " h"ySep " w"3*xSep " v" "t_" c "_" r','v:=spr " h" ySep " w" 3*xSep " v" "t_" c "_" r')
     })
@@ Expand Down @@