Output formatted code with -y switch

source/ide/ide_methods.bas

@@ -10,83 +10,8 @@ FUNCTION ide (ignore)
                 IF ideexit = 0 THEN
                     GetInput 'check for new input
                     IF iCHANGED = 0 AND mB = 0 THEN
-
+                        indented$ = apply_layout_indent$(idecompiledline$)
-                        '-------------------- layout considerations --------------------
+                        IF len(indented$) _ANDALSO idecompiledline$ <> indented$ THEN idesetline idecompiledline, indented$
-                        'previous line was OK, so use layout if available
-                        IF ideautolayout <> 0 OR ideautoindent <> 0 THEN
-                            IF LEN(layout$) THEN
-
-                                'calculate recommended indent level
-                                l = LEN(layout$)
-                                FOR i = 1 TO l
-                                    IF ASC(layout$, i) <> 32 OR i = l THEN
-                                        IF ASC(layout$, i) = 32 THEN
-                                            layout$ = "": indent = i
-                                        ELSE
-                                            indent = i - 1
-                                            layout$ = RIGHT$(layout$, LEN(layout$) - i + 1)
-                                        END IF
-                                        EXIT FOR
-                                    END IF
-                                NEXT
-
-                                IF ideautolayout THEN
-                                    layout2$ = layout$: i2 = 1
-                                    ignoresp = 0
-                                    FOR i = 1 TO LEN(layout$)
-                                        a = ASC(layout$, i)
-                                        IF a = 34 THEN
-                                            ignoresp = ignoresp + 1: IF ignoresp = 2 THEN ignoresp = 0
-                                        END IF
-                                        IF ignoresp = 0 THEN
-                                            IF a = sp_asc THEN ASC(layout2$, i2) = 32: i2 = i2 + 1: GOTO skipchar
-                                            IF a = sp2_asc THEN GOTO skipchar
-                                        END IF
-                                        ASC(layout2$, i2) = a: i2 = i2 + 1
-                                        skipchar:
-                                    NEXT
-                                    layout$ = LEFT$(layout2$, i2 - 1)
-                                END IF
-
-                                IF ideautoindent = 0 THEN
-                                    'note: can assume auto-format
-                                    'calculate old indent (if any)
-                                    indent = 0
-                                    l = LEN(idecompiledline$)
-                                    FOR i = 1 TO l
-                                        IF ASC(idecompiledline$, i) <> 32 OR i = l THEN
-                                            indent = i - 1
-                                            EXIT FOR
-                                        END IF
-                                    NEXT
-                                    indent$ = SPACE$(indent)
-                                ELSE
-                                    indent$ = SPACE$(indent * ideautoindentsize)
-                                END IF
-
-                                IF ideautolayout = 0 THEN
-                                    'note: can assume auto-indent
-                                    l = LEN(idecompiledline$)
-                                    layout$ = ""
-                                    FOR i = 1 TO l
-                                        IF ASC(idecompiledline$, i) <> 32 OR i = l THEN
-                                            layout$ = RIGHT$(idecompiledline$, l - i + 1)
-                                            EXIT FOR
-                                        END IF
-                                    NEXT
-                                END IF
-
-                                IF LEN(layout$) THEN
-                                    layout$ = indent$ + layout$
-                                    IF idecompiledline$ <> layout$ THEN
-                                        idesetline idecompiledline, layout$
-                                    END IF
-                                END IF 'len(layout$) after modification
-
-                            END IF 'len(layout$)
-
-                        END IF 'using layout/indent
-                        '---------------------------------------------------------------
 
                         idecompiledline = idecompiledline + 1
                         idecompiledline$ = idegetline(idecompiledline)

source/qb64pe.bas

@@ -120,7 +120,7 @@ _TITLE WindowTitle
 
 CONST METACOMMAND_STRING_ENCLOSING_PAIR = "''"
 
-DIM SHARED ConsoleMode, No_C_Compile_Mode, NoIDEMode
+DIM SHARED ConsoleMode, No_C_Compile_Mode, NoIDEMode, FormatMode
 DIM SHARED ShowWarnings AS _BYTE, QuietMode AS _BYTE, CMDLineFile AS STRING
 DIM SHARED MonochromeLoggingMode AS _BYTE
 
@@ -483,7 +483,7 @@ DIM SHARED incname(100) AS STRING 'must be full path as given
 DIM SHARED inclinenumber(100) AS LONG
 DIM SHARED incerror AS STRING
 
-
+'Magic constant used to replace . in elements when it is not a UDT access
 DIM SHARED fix046 AS STRING
 fix046$ = "__" + "ASCII" + "_" + "CHR" + "_" + "046" + "__" 'broken up to avoid detection for layout reversion
 
@@ -491,6 +491,7 @@ DIM SHARED layout AS STRING 'passed to IDE
 DIM SHARED layoutok AS LONG 'tracks status of entire line
 
 DIM SHARED layoutcomment AS STRING
+dim shared layoutcontinuations as string 'Any physical lines logically part of the current line
 
 DIM SHARED tlayout AS STRING 'temporary layout string set by supporting functions
 DIM SHARED layoutdone AS LONG 'tracks status of single command
@@ -1478,6 +1479,10 @@ DIM SHARED ExtDepBuf: ExtDepBuf = OpenBuffer%("O", tmpdir$ + "extdep.txt")
 'The $INCLUDEONCE check buffer
 DIM SHARED IncOneBuf: IncOneBuf = OpenBuffer%("O", tmpdir$ + "incone.txt")
 
+'Output for format mode
+dim shared FormatBuf
+if formatmode then formatbuf = openbuffer%("O", tmpdir$ + "format.out")
+
 'begin compilation
 FOR closeall = 1 TO 255: CLOSE closeall: NEXT
 OPEN tmpdir$ + "temp.bin" FOR OUTPUT LOCK WRITE AS #26 'relock
@@ -2866,10 +2871,10 @@ DO
         END IF
     END IF
 
+    layoutoriginal$ = a3$
     a3$ = LTRIM$(RTRIM$(a3$))
     wholeline = a3$
 
-    layoutoriginal$ = a3$
     layoutcomment$ = "" 'clear any previous layout comment
     lhscontrollevel = controllevel
 
@@ -11480,28 +11485,17 @@ DO
         PRINT #9, "[end layout check]"
     END IF
 
-
+    if idemode _andalso continuelinefrom then goto ide4 'continue processing other commands on line
-
-
-    IF idemode THEN
-        IF continuelinefrom <> 0 THEN GOTO ide4 'continue processing other commands on line
 
     IF LEN(layoutcomment$) THEN
         IF LEN(layout$) THEN layout$ = layout$ + sp + layoutcomment$ ELSE layout$ = layoutcomment$
     END IF
 
     IF layoutok = 0 THEN
-            layout$ = layoutoriginal$
+        layout$ = _trim$(layoutoriginal$)
     ELSE
-
         'reverse '046' changes present in autolayout
-            'replace fix046$ with .
+        layout$ = StrReplace$(layout$, fix046$, ".")
-            i = INSTR(layout$, fix046$)
-            DO WHILE i
-                layout$ = LEFT$(layout$, i - 1) + "." + RIGHT$(layout$, LEN(layout$) - (i + LEN(fix046$) - 1))
-                i = INSTR(layout$, fix046$)
-            LOOP
-
     END IF
     x = lhscontrollevel: IF controllevel < lhscontrollevel THEN x = controllevel
     IF definingtype = 2 THEN x = x + 1
@@ -11509,13 +11503,21 @@ DO
     IF declaringlibrary = 2 THEN x = x + 1
     IF declaringlibrary > 0 THEN declaringlibrary = 2
     layout$ = SPACE$(x) + layout$
-        IF linecontinuation THEN layout$ = ""
+    IF linecontinuation THEN layout$ = "" else layoutcontinuations = ""
 
-        GOTO ideret4 'return control to IDE
+    if idemode then GOTO ideret4 'return control to IDE
-    END IF
 
-    'layout is not currently used by the compiler (as appose to the IDE), if it was it would be used here
     skipide4:
+    IF FormatMode _ANDALSO continuelinefrom = 0 THEN
+        IF linecontinuation THEN
+            'This line has a _ for continuation so will not be formatted. Use the original line as read plus
+            'any continued physical lines
+            writebufline FormatBuf, layoutoriginal$ + layoutcontinuations
+        ELSE
+            indented$ = apply_layout_indent$(layoutoriginal$)
+            if len(indented$) then writebufline FormatBuf, indented$ else writebufline FormatBuf, layoutoriginal$
+        END IF
+    END IF
 LOOP
 
 'add final line
@@ -12465,6 +12467,13 @@ END IF
 'actions are performed on the disk based files
 WriteBuffers ""
 
+if formatmode then
+    'Move temp file to final location
+    errNo = copyfile(tmpdir$ + "format.out", path.exe$ + file$ + extension$)
+    if errNo <> 0 then a$ = "Error saving formatted output to " + path.exe$ + file$ + extension$: goto errmes
+    goto No_C_Compile
+end if
+
 '=== BEGIN: embedding files ===
 eflFF = FREEFILE
 OPEN "O", #eflFF, tmpdir$ + "embedded.cpp"
@@ -13197,6 +13206,7 @@ FUNCTION ParseCMDLineArgs$ ()
                 PRINT "  -s[:switch=true/false]  View/edit compiler settings"
                 PRINT "  -l:<line number>        Start the IDE at the specified line number"
                 PRINT "  -p                      Purge all pre-compiled content first"
+                PRINT "  -y                      Output formatted source file"
                 PRINT "  -z                      Generate C code without compiling to executable"
                 PRINT "  -f[:setting=value]      compiler settings to use"
                 PRINT
@@ -13225,6 +13235,12 @@ FUNCTION ParseCMDLineArgs$ ()
                 ConsoleMode = 1
                 NoIDEMode = 1 'Implies -c
                 cmdlineswitch = -1
+            CASE "-y" 'Format
+                FormatMode = -1
+                ConsoleMode = 1
+                NoIDEMode = 1
+                QuietMode = -1
+                cmdlineswitch = -1
             CASE "-w" 'Show warnings
                 ShowWarnings = -1
                 cmdlineswitch = -1
@@ -19819,6 +19835,7 @@ END FUNCTION
 FUNCTION lineformat$ (a$)
     a2$ = ""
     linecontinuation = 0
+    layoutcontinuations = ""
 
     continueline:
 
@@ -20753,6 +20770,7 @@ FUNCTION lineformat$ (a$)
             ELSE
                 a$ = lineinput3$
                 IF a$ = CHR$(13) THEN GOTO lineformatdone2
+                layoutcontinuations = layoutcontinuations + chr$(10) + a$
             END IF
 
             linenumber = linenumber + 1
@@ -23735,6 +23753,7 @@ END FUNCTION
 '$INCLUDE:'utilities\hash.bas'
 '$INCLUDE:'utilities\type.bas'
 '$INCLUDE:'utilities\give_error.bas'
+'$INCLUDE:'utilities\format.bas'
 
 DEFLNG A-Z
 

source/utilities/format.bas

@@ -0,0 +1,73 @@
+'Apply indentation to layout$ as per settings and remove control characters.
+FUNCTION apply_layout_indent$(original$)
+    layout2$ = layout$
+    'previous line was OK, so use layout if available
+    IF ideautolayout <> 0 OR ideautoindent <> 0 THEN
+        IF LEN(layout2$) THEN
+
+            'calculate recommended indent level
+            l = LEN(layout2$)
+            FOR i = 1 TO l
+                IF ASC(layout2$, i) <> 32 OR i = l THEN
+                    IF ASC(layout2$, i) = 32 THEN
+                        layout2$ = "": indent = i
+                    ELSE
+                        indent = i - 1
+                        layout2$ = RIGHT$(layout2$, LEN(layout2$) - i + 1)
+                    END IF
+                    EXIT FOR
+                END IF
+            NEXT
+
+            IF ideautolayout THEN
+                layout3$ = layout2$: i2 = 1
+                ignoresp = 0
+                FOR i = 1 TO LEN(layout2$)
+                    a = ASC(layout2$, i)
+                    IF a = 34 THEN
+                        ignoresp = ignoresp + 1: IF ignoresp = 2 THEN ignoresp = 0
+                    END IF
+                    IF ignoresp = 0 THEN
+                        IF a = sp_asc THEN ASC(layout3$, i2) = 32: i2 = i2 + 1: GOTO skipchar
+                        IF a = sp2_asc THEN GOTO skipchar
+                    END IF
+                    ASC(layout3$, i2) = a: i2 = i2 + 1
+                    skipchar:
+                NEXT
+                layout2$ = LEFT$(layout3$, i2 - 1)
+            END IF
+
+            IF ideautoindent = 0 THEN
+                'note: can assume auto-format
+                'calculate old indent (if any)
+                indent = 0
+                l = LEN(original$)
+                FOR i = 1 TO l
+                    IF ASC(original$, i) <> 32 OR i = l THEN
+                        indent = i - 1
+                        EXIT FOR
+                    END IF
+                NEXT
+                indent$ = SPACE$(indent)
+            ELSE
+                indent$ = SPACE$(indent * ideautoindentsize)
+            END IF
+
+            IF ideautolayout = 0 THEN
+                'note: can assume auto-indent
+                l = LEN(original$)
+                layout2$ = ""
+                FOR i = 1 TO l
+                    IF ASC(original$, i) <> 32 OR i = l THEN
+                        layout2$ = RIGHT$(original$, l - i + 1)
+                        EXIT FOR
+                    END IF
+                NEXT
+            END IF
+
+            IF LEN(layout2$) THEN
+                apply_layout_indent$ = indent$ + layout2$
+            END IF
+        END IF 'len(layout2$)
+    END IF 'using layout/indent
+END SUB