diff --git a/CHANGELOG b/CHANGELOG index ef52dca..ecb1192 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -62,4 +62,5 @@ 15/08/2022 - Added open/close braces highlight - + - Fixed GO structure reader + diff --git a/lib/editor.tcl b/lib/editor.tcl index 246ba35..db4dbd6 100644 --- a/lib/editor.tcl +++ b/lib/editor.tcl @@ -488,7 +488,7 @@ namespace eval Editor { puts [Tree::InsertItem $tree $treeItemName $procName "procedure" "$procName ($params)"] } # GO function - if {[regexp -nocase -all -- {^\s*?func\s*?\((\w+\s*?\*\w+)\)\s*?(\w+)\((.*?)\)\s*?(\(\w+\)|\w+|)\s*?\{} $line match v1 funcName params returns]} { + if {[regexp -nocase -all -- {^\s*?func\s*?\((\w+\s*?\*\w+)\)\s*?(\w+)\((.*?)\)\s*?([a-zA-Z0-9\{\}\[\]\(\)-_.]*?|)\s*?\{} $line match v1 funcName params returns]} { # set procName "$v2$v3$v4$v5" # lappend procList($activeProject) [list $procName [string trim $params]] if {$v1 ne ""} { @@ -499,7 +499,7 @@ namespace eval Editor { # tree parent item type text puts [Tree::InsertItem $tree $treeItemName $funcName "func" "$functionName ($params)"] } - if {[regexp -nocase -all -- {^\s*?func\s*?(\w+)\((.*?)\) (\(\w+\)|\w+|)\s*?\{} $line match funcName params returns]} { + if {[regexp -nocase -all -- {^\s*?func\s*?(\w+)\((.*?)\)\s+?([a-zA-Z0-9\{\}\[\]\(\)-_.]*?|)\s*?\{} $line match funcName params returns]} { # puts "$treeItemName func $funcName $params" # tree parent item type text puts [Tree::InsertItem $tree $treeItemName $funcName "func" "$funcName ($params)"] diff --git a/projman.tcl b/projman.tcl index 47af2ac..7c8b602 100755 --- a/projman.tcl +++ b/projman.tcl @@ -10,7 +10,7 @@ exec wish "$0" -- "$@" ###################################################### # Version: 2.0.0 # Release: alpha -# Build: 15082022110520 +# Build: 15082022113125 ###################################################### # определим текущую версию, релиз и т.д.