From bcfb9fb7dff18390c7169336a9fb2857cc44e476 Mon Sep 17 00:00:00 2001 From: svkalinin Date: Fri, 28 Oct 2022 13:27:54 +0300 Subject: [PATCH] =?UTF-8?q?=D0=94=D0=BE=D0=B1=D0=B0=D0=B2=D0=BB=D0=B5?= =?UTF-8?q?=D0=BD=D1=8B=20=D0=BE=D0=BF=D1=86=D0=B8=D0=B8=20=D0=B4=D0=BB?= =?UTF-8?q?=D1=8F=20=D0=B2=D0=BA=D0=BB=D1=8E=D1=87=D1=81=D0=B5=D0=BD=D0=B8?= =?UTF-8?q?=D1=8F=20=D0=BF=D0=BE=D0=BB=D0=B4=D0=B6=D1=81=D0=BA=D0=B0=D0=B7?= =?UTF-8?q?=D0=BE=D0=BA=20=D0=BF=D0=BE=20=D0=BF=D0=B5=D1=80=D0=B5=D0=BC?= =?UTF-8?q?=D0=B5=D0=BD=D0=BD=D1=8B=D0=BC=20=D0=B8=20=D0=BF=D1=80=D0=BE?= =?UTF-8?q?=D1=86=D0=B5=D0=B4=D1=83=D1=80=D0=B0=D0=BC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- lib/config.tcl | 2 + lib/editor.tcl | 98 +++++++++++++++++++++++++++++++++++++++++++++-- lib/git.tcl | 1 + lib/procedure.tcl | 4 +- projman.tcl | 2 +- 5 files changed, 101 insertions(+), 6 deletions(-) diff --git a/lib/config.tcl b/lib/config.tcl index e4b7fc1..636072a 100644 --- a/lib/config.tcl +++ b/lib/config.tcl @@ -56,6 +56,8 @@ selectBorder=0 editorWrap=word lineNumberShow=true tabSize=4 +procedureHelper=false +variableHelper=true " proc Config::create {dir} { set cfgFile [open [file join $dir projman.ini] "w+"] diff --git a/lib/editor.tcl b/lib/editor.tcl index a76cdde..3cce76f 100644 --- a/lib/editor.tcl +++ b/lib/editor.tcl @@ -367,15 +367,107 @@ namespace eval Editor { } + proc VarHelper {x y w word} { + global editors lexers variables + variable txt + variable win + # set txt $w.frmText.t + set txt $w + set win .varhelper + # puts "$x $y $w $word" + set varList [dict get $editors $txt variableList] + set findedVars "" + foreach i [lsearch -all $varList $word*] { + # puts [lindex $varList $i] + set item [lindex [lindex $varList $i] 0] + # puts $item + if {[lsearch $findedVars $item] eq "-1"} { + lappend findedVars $item + } + } + if { [winfo exists $win] } { destroy $win } + if {$findedVars eq ""} { + return + } + + toplevel $win + wm transient $win . + wm overrideredirect $win 1 + + listbox $win.lBox -width 30 -border 2 -yscrollcommand "$win.yscroll set" -border 1 + ttk::scrollbar $win.yscroll -orient vertical -command "$win.lBox yview" + pack $win.lBox -expand true -fill y -side left + pack $win.yscroll -side left -expand false -fill y + + foreach { word } $findedVars { + $win.lBox insert end $word + } + + catch { $win.lBox activate 0 ; $win.lBox selection set 0 0 } + + if { [set height [llength $findedVars]] > 10 } { set height 10 } + $win.lBox configure -height $height + + bind $win { + destroy $Editor::win + focus -force $Editor::txt.t + break + } + bind $win.lBox { + destroy $Editor::win + focus -force $Editor::txt.t + break + } + bind $win.lBox { + set findString [dict get $lexers [dict get $editors $Editor::txt fileType] procFindString] + set values [.gotofunction.lBox get [.gotofunction.lBox curselection]] + regsub -all {PROCNAME} $findString $values str + Editor::FindFunction $Editor::txt "$str" + destroy .gotofunction + $Editor::txt tag remove sel 1.0 end + # focus $Editor::txt.t + break + } + bind $win.lBox {Editor::ListBoxSearch %W %A} + # Определям расстояние до края экрана (основного окна) и если + # оно меньше размера окна со списком то сдвигаем его вверх + set winGeom [winfo reqheight $win] + set topHeight [winfo height .] + # puts "$x, $y, $winGeom, $topHeight" + if [expr [expr $topHeight - $y] < $winGeom] { + set y [expr $topHeight - $winGeom] + } + wm geom $win +$x+$y + + } + proc ReleaseKey {k txt} { + global cfgVariables set pos [$txt index insert] + set lineNum [lindex [split $pos "."] 0] + set posNum [lindex [split $pos "."] 1] SearchBrackets $txt + # set lineStart [$txt index "$pos linestart"] + # puts "$pos $lineStart" + if {$cfgVariables(variableHelper) eq "true"} { + set lastSymbol [string last "$" [$txt get $lineNum.0 $pos]] + if {$lastSymbol ne "-1"} { + set word [string trim [$txt get $lineNum.[expr $lastSymbol + 1] $pos]] + # puts "$pos; $lineNum; $pos; $lastSymbol; $word" + set box [$txt bbox insert] + set box_x [expr [lindex $box 0] + [winfo rootx $txt] ] + set box_y [expr [lindex $box 1] + [winfo rooty $txt] + [lindex $box 3] ] + Editor::VarHelper $box_x $box_y $txt $word + } + } + if {$cfgVariables(procedureHelper) eq "true"} { + puts "Find proc" + } + switch $k { Return { - set lineNum [lindex [split $pos "."] 0] - set posNum [lindex [split $pos "."] 1] regexp {^(\s*)} [$txt get [expr $lineNum - 1].0 [expr $lineNum - 1].end] -> spaceStart - # puts "$pos, $lineNum, $posNum, >$spaceStart<" + # puts "$pos, $lineNum, $posNum, >$spaceStart<" $txt insert insert $spaceStart Editor::Indent $txt } diff --git a/lib/git.tcl b/lib/git.tcl index 3d0f4ad..43c20fc 100644 --- a/lib/git.tcl +++ b/lib/git.tcl @@ -141,6 +141,7 @@ namespace eval Git { proc Diff {f} { global cfgVariables activeProject set cmd exec + set res "" lappend cmd $cfgVariables(gitCommand) lappend cmd "diff" lappend cmd "--" diff --git a/lib/procedure.tcl b/lib/procedure.tcl index bb47f48..c658ed2 100644 --- a/lib/procedure.tcl +++ b/lib/procedure.tcl @@ -69,7 +69,7 @@ proc ResetModifiedFlag {w} { $w.frmText.t edit modified false set modified($w) "false" set lbl [string trimleft [$nbEditor tab $w -text] "* "] - puts "ResetModifiedFlag: $lbl" + # puts "ResetModifiedFlag: $lbl" $nbEditor tab $w -text $lbl } proc SetModifiedFlag {w} { @@ -77,7 +77,7 @@ proc SetModifiedFlag {w} { #$w.frmText.t edit modified false set modified($w) "true" set lbl [$nbEditor tab $w -text] - puts "SetModifiedFlag: $w; $modified($w); >$lbl<" + # puts "SetModifiedFlag: $w; $modified($w); >$lbl<" if {[regexp -nocase -all -- {^\*} $lbl match] == 0} { set lbl "* $lbl" } diff --git a/projman.tcl b/projman.tcl index 227b948..39bc686 100755 --- a/projman.tcl +++ b/projman.tcl @@ -10,7 +10,7 @@ exec wish "$0" -- "$@" ###################################################### # Version: 2.0.0 # Release: alpha -# Build: 21102022145927 +# Build: 28102022132657 ###################################################### # определим текущую версию, релиз и т.д.