Merging pull request 20. Update Build.bas

Author: hilkoc

src/vbaDeveloper.xlam/Build.bas

@@ -7,11 +7,14 @@ Attribute VB_Name = "Build"
 '     * Microsoft Visual Basic for Applications Extensibility 5.3
 '     * Microsoft Scripting Runtime
 ' 3. Rename the project to 'vbaDeveloper'
-' 5. Enable programatic access to VBA:
+' 4. Enable programatic access to VBA:
 '       File -> Options -> Trust Center, Trust Center Settings, -> Macros,
 '       tick the box: 'Enable programatic access to VBA'  (In excel 2010: 'Trust access to the vba project object model')
 '       If you get 'path not found' exception in Excel 2013, include the following step:
-'           In 'Trust Center' settings, go to 'File Block Settings' and check 'open' and/or 'save' for 'Excel 2007 and later Macro-Enabled Workbooks and Templates'.
+'           In 'Trust Center' settings, go to 'File Block Settings' and check 'open' and/or 'save' 
+'           for 'Excel 2007 and later Macro-Enabled Workbooks and Templates'.
+' 5. If using a non-English version of Excel, rename your current workbook into ThisWorkbook (in VB Editor, press F4,
+'    then under the local name for Microsoft Excel Objects, select the workbook. Set the property '(Name)' to ThisWorkbook)
 ' 6. In VB Editor, press F4, then under Microsoft Excel Objects, select ThisWorkbook.Set the property 'IsAddin' to TRUE
 ' 7. In VB Editor, menu File-->Save Book1; Save as vbaDeveloper.xlam in the same directory as 'src'
 ' 8. Close excel. Open excel with a new workbook, then open the just saved vbaDeveloper.xlam

src/vbaDeveloper.xlam/Formatter.bas

@@ -62,7 +62,7 @@ Private Const BEG_END_ELSEIF = "ElseIf"
 Private Const BEG_END_CASE = "Case "
 
 Private Const THEN_KEYWORD = "Then"
-Private Const LINE_CONTINUATION = "_"
+Private Const LINE_CONTINUATION = " _"
 
 Private Const INDENT = "    "
 
@@ -199,8 +199,9 @@ Public Sub formatCode(codePane As codeModule)
     Dim lineCount As Integer
     lineCount = codePane.CountOfLines
 
-    Dim indentLevel As Integer, nextLevel As Integer, levelChange As Integer
+    Dim indentLevel As Integer, nextLevel As Integer, levelChange As Integer, isPrevLineContinuated as Boolean
     indentLevel = 0
+    isPrevLineContinuated = False
     Dim lineNr As Integer
     For lineNr = 1 To lineCount
         Dim line As String
@@ -231,7 +232,10 @@ Public Sub formatCode(codePane As codeModule)
             line = indentation(indentLevel) + line
             indentLevel = nextLevel
         End If
-        Call codePane.ReplaceLine(lineNr, line)
+        If Not isPrevLineContinuated Then
+            Call codePane.ReplaceLine(lineNr, line)
+        EndIf
+        isPrevLineContinuated = isLineContinuated(line)
     Next
     Exit Sub
 formatCodeError:
@@ -261,7 +265,7 @@ Private Function indentChange(ByVal line As String) As Integer
     Set w = vbaWords
 
     If isEqual(line, ONEWORD_END_FOR) Or _
-        isEqual(line, ONEWORD_END_LOOP) Then
+        lineStartsWith(ONEWORD_END_LOOP, line) Then
         indentChange = -1
         GoTo hell
     End If
@@ -321,6 +325,13 @@ Private Function isOneLineIfStatemt(line As String) As Boolean
 End Function
 
 
+Private Function isLineContinuated(line As String) As Boolean
+    Dim trimmedLine As String
+    trimmedLine = TrimComments(line)
+    isLineContinuated = lineEndsWith(LINE_CONTINUATION, trimmedLine)
+End Function
+
+
 ' Trims trailing comments (and whitespace before a comment) from a line of code
 Private Function TrimComments(ByVal line As String) As String
     Dim c               As Long

src/vbaDeveloper.xlam/Menu.bas

@@ -39,9 +39,9 @@ Public Sub createMenu()
         caption = projectName & " (" & Dir(project.fileName) & ")" '<- this can throw error
 
         Dim exCommand As String, imCommand As String, formatCommand As String
-        exCommand = "'Menu.exportVbProject """ & projectName & """'"
-        imCommand = "'Menu.importVbProject """ & projectName & """'"
-        formatCommand = "'Menu.formatVbProject """ & projectName & """'"
+        exCommand = "'Menu.exportVbProject """ & project.fileName & """'"
+        imCommand = "'Menu.importVbProject """ & project.fileName & """'"
+        formatCommand = "'Menu.formatVbProject """ & project.fileName & """'"
 
         addMenuItem exSubMenu, exCommand, caption
         addMenuItem imSubMenu, imCommand, caption
@@ -121,29 +121,28 @@ Public Sub refreshMenu()
     menu.createMenu
 End Sub
 
-Public Sub exportVbProject(ByVal projectName As String)
+Public Sub exportVbProject(ByVal projectPath As String)
     On Error GoTo exportVbProject_Error
 
     Dim project As VBProject
-    Set project = Application.VBE.VBProjects(projectName)
+    Set project = GetProjectByPath(projectPath)
     Build.exportVbaCode project
     Dim wb As Workbook
     Set wb = Build.openWorkbook(project.fileName)
     NamedRanges.exportNamedRanges wb
     MsgBox "Finished exporting code for: " & project.name
 
-    On Error GoTo 0
     Exit Sub
 exportVbProject_Error:
     ErrorHandling.handleError "Menu.exportVbProject"
 End Sub
 
 
-Public Sub importVbProject(ByVal projectName As String)
+Public Sub importVbProject(ByVal projectPath As String)
     On Error GoTo importVbProject_Error
 
     Dim project As VBProject
-    Set project = Application.VBE.VBProjects(projectName)
+    Set project = GetProjectByPath(projectPath)
     Build.importVbaCode project
     Dim wb As Workbook
     Set wb = Build.openWorkbook(project.fileName)
@@ -157,11 +156,11 @@ importVbProject_Error:
 End Sub
 
 
-Public Sub formatVbProject(ByVal projectName As String)
+Public Sub formatVbProject(ByVal projectPath As String)
     On Error GoTo formatVbProject_Error
 
     Dim project As VBProject
-    Set project = Application.VBE.VBProjects(projectName)
+    Set project = GetProjectByPath(projectPath)
     Formatter.formatProject project
     MsgBox "Finished formatting code for: " & project.name & vbNewLine _
     & vbNewLine _
@@ -250,3 +249,22 @@ Function GetFolder(InitDir As String) As String
     GetFolder = sItem
     Set fldr = Nothing
 End Function
+
+
+Function GetProjectByPath(ByVal projectPath As String) As VBProject
+    'Simple search to find project by file path
+    Dim project As VBProject
+    For Each project In Application.VBE.VBProjects
+        On Error GoTo skipone
+        If UCase(project.fileName) = UCase(projectPath) Then
+            Set GetProjectByPath = project
+            Exit Function
+        End If
+nextprj:
+    Next project
+    'If not found return nothing
+    Exit Function
+skipone:
+    Resume nextprj
+End Function
+

src/vbaDeveloper.xlam/Test.bas

@@ -46,7 +46,9 @@ Public Sub testExport()
     Dim proj_name As String
     proj_name = "vbaDeveloper"
 
-    menu.exportVbProject proj_name
+    Dim vbaProject As Object
+    Set vbaProject = Application.VBE.VBProjects(proj_name)
+    menu.exportVbProject vbaProject.fileName
 End Sub