svk/projman
svk/projman
1
0
Fork 0
Code Issues 1 Pull Requests Actions Packages Projects Releases Wiki Activity

Исправлена процедура (рас)комментирования

Browse Source
This commit is contained in:
svkalinin 2022-12-19 15:29:17 +03:00
parent 3467d6a89a
commit 0fe4541dc0
3 changed files with 26 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
README.md
View File

@ -16,6 +16,7 @@ Highlightning and source code navigation:
* Shell (BASH) * Shell (BASH)
* Markdown * Markdown
* YAML (Ansible support) * YAML (Ansible support)
* Lua
Highlightning: Highlightning:

35
lib/editor.tcl
View File

@ -87,14 +87,14 @@ namespace eval Editor {
set lineNum [lindex [split $pos "."] 0] set lineNum [lindex [split $pos "."] 0]
set posNum [lindex [split $pos "."] 1] set posNum [lindex [split $pos "."] 1]
if {[info procs GetComment:$fileType] ne ""} { # if {[info procs GetComment:$fileType] ne ""} {
set commentProcedure "GetComment:$fileType"
} else {
set commentProcedure {GetComment:Unknown}
}
# set commentProcedure "GetComment" # set commentProcedure "GetComment"
# } else {
# set commentProcedure {GetComment:Unknown}
# }
set commentProcedure "GetComment"
# puts "$fileType, $commentProcedure" puts "$fileType, $commentProcedure"
if {$selIndex != ""} { if {$selIndex != ""} {
set lineBegin [lindex [split [lindex $selIndex 0] "."] 0] set lineBegin [lindex [split [lindex $selIndex 0] "."] 0]
set lineEnd [lindex [split [lindex $selIndex 1] "."] 0] set lineEnd [lindex [split [lindex $selIndex 1] "."] 0]
@ -105,7 +105,7 @@ namespace eval Editor {
} }
for {set i $lineBegin} {$i <=$lineEnd} {incr i} { for {set i $lineBegin} {$i <=$lineEnd} {incr i} {
set str [$txt get $i.0 $i.end] set str [$txt get $i.0 $i.end]
set commentSymbolIndex [$commentProcedure $str] set commentSymbolIndex [$commentProcedure $fileType $str]
if {$commentSymbolIndex != 0} { if {$commentSymbolIndex != 0} {
$txt delete $i.[lindex $commentSymbolIndex 0] $i.[lindex $commentSymbolIndex 1] $txt delete $i.[lindex $commentSymbolIndex 0] $i.[lindex $commentSymbolIndex 1]
} }
@ -116,7 +116,7 @@ namespace eval Editor {
} else { } else {
set posNum [lindex [split $pos "."] 1] set posNum [lindex [split $pos "."] 1]
set str [$txt get $lineNum.0 $lineNum.end] set str [$txt get $lineNum.0 $lineNum.end]
set commentSymbolIndex [$commentProcedure $str] set commentSymbolIndex [$commentProcedure $fileType $str]
if {$commentSymbolIndex != 0} { if {$commentSymbolIndex != 0} {
$txt delete $lineNum.[lindex $commentSymbolIndex 0] $lineNum.[lindex $commentSymbolIndex 1] $txt delete $lineNum.[lindex $commentSymbolIndex 0] $lineNum.[lindex $commentSymbolIndex 1]
} }
@ -127,12 +127,23 @@ namespace eval Editor {
proc GetComment {fileType str} { proc GetComment {fileType str} {
global lexers global lexers
# puts [dict get $lexers $fileType commentSymbol] # puts [dict get $lexers $fileType commentSymbol]
if {[dict exists $lexers $fileType commentSymbol] == 0} { if [dict exists $lexers $fileType commentSymbol] {
return # return
set symbol [dict get $lexers $fileType commentSymbol]
} else {
set symbol "#"
} }
regsub -all {\{} $str "\\{" str
regsub -all {\}} $str "\\}" str
regsub -all {\[} $str {\\[} str
regsub -all {\]} $str {\\]} str
if {[regexp -nocase -indices -- {(^| )([dict get $lexers $fileType commentSymbol]\s)(.+)} $str match v1 v2 v3]} { set cmd "regexp -nocase -indices -- {(^|\s+)\\s*($symbol\\s*)(.*)} {$str} match v1 v2 v3"
puts "$match, $v1, $v2, $v3"
puts $cmd
# puts [eval $cmd]
if [eval $cmd] {
puts "$match, $v2, $v3"
return [list [lindex [split $v2] 0] [lindex [split $v3] 0]] return [list [lindex [split $v2] 0] [lindex [split $v3] 0]]
} else { } else {
return 0 return 0

2
projman.tcl
View File

@ -10,7 +10,7 @@ exec wish "$0" -- "$@"
###################################################### ######################################################
# Version: 2.0.0 # Version: 2.0.0
# Release: alpha # Release: alpha
# Build: 16122022145953 # Build: 19122022152600
###################################################### ######################################################
# определим текущую версию, релиз и т.д. # определим текущую версию, релиз и т.д.