Hello,

first of all, please speak english with me, i cant speak any word russian.

i've found this little summary SynMix (http://sepa.spb.ru/d.php?syn/SynMix.rar) because i fail with compile of the mystix-source code.
Your code works, but with a little changes, because i use an old Delphi version (5).

In "TSynEditCodeFoldingPlugin.AfterPaint", "TSynEditCodeFoldingPlugin.LinesDeleted" and "TSynEditCodeFoldingPlugin.LinesInserted" you call inherited. These methods are override of the upper class TSynEditPlugin. In this class these 3 methods are virtual; abstract. - What should the compiler do? It crashs hard... I comment it out of the code and it works good. You apparently dont have this problems with a newer delphi version.

Second Change is in "TCustomSynEdit.ReScanForFoldRanges". I changed it to:



Now i can compile it with Delphi 5 and it works.... but it crashs. In my little test program I set in the main.formcreate:


In the SynMemo.OnChange-Method i call "ReScanForFoldRanges". If I start my test program and edit the text (i.e. change a endif to other things, that he dont fold this code), it works good.

But if I fold a block (only then!) and add lines after it and delete it, the lines and [+] are painted wrong and later it crashs with an Access Violation in "TSynEditFoldRanges.GetCount".
What I do wrong or do you have the same problems?

Help me.  

PS: I have also changed "CanExecuteInLine". There were some errors too, if you backspace a Line to a folded block above and such things.
And another thing, that I can copy folded blocks (that he dont copy only the first line).. But if I paste it, it crashs also, because he called OnChange->RescanforFoldRanges.... 

Это сообщение отредактировал(а) DavidCl0nel - 31.7.2006, 11:23

Yes, we have same problems and work on them. There are sometimes drop of all foldranges when you have some line collapsed and delete text somwhere. But it depends on highlughter you are using. Now i can't say more =(
Copying & deleting of collapsed lines can be done. It needs to write codefolded version of TCustomSynEdit.GetSelText so undo/redo will work with deleting collapsed lines. I've write it but take many strange bugs in other parts of code. If anyone can properly implement it, please post it here. 

After further investigation I found the problem for the crash.

In "ReScanForFoldRanges"


This free (I commented it) called the destructor (see below) and destroys in his loop TemporaryAllFoldRanges.


In the part above "Now we need to combine collapsed items with new one's" you add (AddFold) the FoldRanges to Temp. AddFold does TList.Add and this TList work with the Pointer, so you dont copy the fold, you only put a pointer to it. And later you free the items and the pointer points to somewhere. These Informations you copy from Temp to fAllFoldRanges. In my debug session all was right, only one FromLine-Attribute was set to a very high line number, that doesnt exists.
I have commented the free now, and it works.




Another bug occur, if you edit, and all folds are collapsed. Then you get an EListError. In "TCustomSynEdit.UpdateFoldRangeParents" I changed the loop to:






Another change (i sayed it in last post), that I changed the function, that controls, what key you are allowed to press at/near collapsed folds, that you dont destroy the lines. In your version you can Backspace a line to a collapsed block above and the line is add to the collapsed-headerline. If you uncollapse the block the added line is in your folded block.... Some more cases I've catched, but maybe I miss something. Try it. I changed "TCustomSynEdit.CanExecuteInLine" to





I changed GetSelText to, that he copy all lines.





Please cross-check my changes, that I dont do any evil things. More eyes see more errors. ;)

Now it works stable with my tests, but one time I get a weird error while editing (he destroys the folds again), but i cant see it again.







Edit:
Another little change: Uncollapsing all folds, before you disable CodeFolding.


Question: For what using is "procedure TCustomSynEdit.UpdateBmps", it isnt used yet?

Это сообщение отредактировал(а) DavidCl0nel - 1.8.2006, 14:31

Great work man!
But why do you use 

Isn't it automatically moves caret to next line by ENTER?
I make all changes you post here but still have some bugs:
1. i have collapsed line 
begin [...] end
i place cursor to start of line below it and press BkSpace = drop all foldranges
2. i have collapsed line
i try to paste a block of text above it, and again take drop of foldranges
3. collapsed line in selected text. Pressing Del deletes colapsed range. But pressing Ctrl-Z = drop again
Do you have same bugs? May be we have some changes in other parts of code, because i have some edits after last upload of SynMix. Can you mail me your SynEdit.pas? (sepich()rambler.ru) I wanna look to it thru WinDiff.

Let's sinchronize our work and take this bugs down =)

I use folded blocks without ending, maybe you use it in another way. And I have a other language syntax highlighting, but i translate it to delphi code blocks:

Maybe you use it on the other Way and get such weird things?


If you have two folded lines now without a free line between them:

And put the cursor with Key END to the end of first line (There are two endings, if you press END more than one. One after the line, and another 5 spaces behind the [...] - why?! Can you explain it?). I have add this case, that he goes to the next line and insert the new line.

. = Cursor Position

If i dont have this case, i have no opportunity to devide such folded blocks.






Tomorrow I will test your 3 cases again (today no free time for it) and send you both pas files (I have another little changed in SynEditCodeFolding.pas i think...)

Yes i use endings. There are mod named "//###mod pos of [...] to left" which makes from
begin end [...]
to
begin [...] end
This 5 spaces are needed to provide space for [...] sign. 

i have this working normal without manually move caret =) 

Ok, I have tested your 3 cases and I have the same errors. Number1 I solved yet and now I check the complete behaviour of CanExecuteInLine with SelText. For pasting I have no idea where i should search at the moment.

I have send a email with both pas files to you.

Edit: If I don't move Cursor, it destroys the fold, if I press return at the end of Line1 of 2 collapsed lines.

Это сообщение отредактировал(а) DavidCl0nel - 3.8.2006, 10:39

Changes in "TCustomSynEdit.CanExecuteInLine" for Selecting Text:


I have changed it for case3, he delete the block now correctly, but he keep the wrong part in UndoBuffer. So, if you do undo, there are some lines missing. I don't found the real place for the problem. In my quoted part he calls "fCodeFoldingPlugin.LinesDeleted" with the correct ranges, but later (Step Step Step through the programm) he comes through "TCustomSynEdit.ExecuteCommand". This command calls SelText to get the selected Strings, to put this info into the UndoBuffer, but there he copy only the marked line count, not with the uncollapsed. But the same function is called, if I copy selected text to clipboard. For both cases he takes the BlockBegin and BlockEnd positions, but for the Delete-Case it are wrong.

Snip of "TCustomSynEdit.GetSelText":

If I change the -2 to 0 then he fill the UndoBuffer correctly, but crashs, if i copy the SelText to Clipboard. I hope you can understand me. Help! I don't find the correct place to change this behavior at the moment.

For this problem I try to copy a space line, a folded block and another space line (so 3 visible lines with 3 collapsed lines in the folded block). I mark this 3 lines in NormalMode. In LineMode for Selection he destroys something with Delete this Block, but it seems to work correct with Undo. Graaarr!

The paste-problem (case-2) is also unsolved.




Edit: I have forgotten this method. I had to reimplement the Delete-Instruction (why you commented it?!):



And another Edit: Whats with the commented fAllFoldRanges.Free (it destroys TemporaryFoldRanges) in "ReScanForFoldRanges"? Is it really necessary (then we had to think about it, how to implement it correctly that it don't destroy Temp) or is it ok so now? I don't test it with a profiler yet, that I can see the memleaks.

Это сообщение отредактировал(а) DavidCl0nel - 3.8.2006, 16:12

Hi!
Sorry for late answer, i was left city for a day. 
I add all your changes to SynMix. Your problem with move cursor in 2 collapsed lines is fixed. It will be good if you download new pack and make all patches from it. So we will speak about same things. I also fixed wrong indent of all text (from 2 to 4 spaces) There was also some memory leaks fixed by Vitalik, after last upload SynMix. This changes are also here.

So what bugs we have now:
1. deleting and editing near collapsed line all works ok, but here is drop of foldranges when place cursor on line after it and press BkSpace
2. paste of block text above collapsed line
3. copy collapsed line and paste it somewhere = drop
4. delete collapsed line in selection and press Ctrl-Z
5. if collapsed line was selected in normal mode - there no copy contents to buffer. if select it in line mode - all ok (but bug when paste it)
6. pressing Del key on line above collapsed. This line must be non empty. Collapsed text destroys.


i have such: undo buffer is store right text, but drop of foldranges

it was bug with pressing Del on empty line above collapsed. Now it fixed my method slightly differ from standart.

How do you test memleaks? Do you use FastMM4?

PS I not very professional programmer. Those codefolding implementation is very dislike me and this almost at top of my programming level. So my methods may be not wonderfull. Feel free to change them and post here. Also this forum has [ code] tag, try to use it instead of [ quote], so code will look more like in SynEdit =)

I look at your merged code on Monday. 1. and 6. sounds like to fix it in the CanExecute-Method.

For pasting i dont have a idea, where i start to search for the bug. 

I dont look for memleaks at the moment, if you (or Vitalik) check it, its ok. ;) But if so, then i use FastMM, yes. But not at the moment with my little testbench.

The codefolding code is a good start, but all this little things, that destroy the folds, seeming not checked at the moment. I cant compile the mystix cause some missing other controls, but if i test it with a compiled binary, it has the same hazardous behaviour - so we must go on to fix it. ;)

I show you my last changes

Problem 1 with pasting above collapsed blocks:


It is done here (there it was in comments):



Problem 2 with Undo and Redo after Delete a Block... It wasnt implemented! The type has a new element "crDeleteCollapsedFold", but it isnt used in both functions. I implement it and add a case else with an message box. Maybe there are on some cases also missed instructions.



And the structure fUndoList had to fill correctly if you delete lines. The function is now:

There are some changes with "fOwner.BlockEnd.Char>3" and such things. What should it do there? I commented it like in my older version and change the filling of fUndoList correctly.

! At this time Delete a Block and undo it works correctly, but Redo (delete again) the block destroys the fold. There are a error in it, but i don't know where at the moment.

And the biggest change is in CanExecuteInLine... complete function:

It works a little bit different now. In older version it didnt look at folded lines and allow editing. Now it deny all changes, except the cases that are allowed in the code. Maybe there are some problems even at the moment. A known error is, if you add lines near a collapsed block. Sometimes he change the position of the foldstart wrong. 

Another error, that I didn't can re-adjust always, is, that it destroys the fold, if select something in normal select mode and then switch to line select mode.




So my new error list is:
  1. Return near collapsed line may destroy fold
  2. Redo after Undo ater delete collapsed Line
  3. Sometimes it drops folding if select something in normal mode and then switch to line select mode 


Maybe you find other errors (I dont hope  it should be sometime all correctly ).

I send the file by email, maybe i miss to say a change here.


PS: I had to split the post in 2 parts, because it was to big for one. Be sure, to see both. ;)

Это сообщение отредактировал(а) DavidCl0nel - 8.8.2006, 14:45

Finally forum start work for me!
Here is some fixed part of CanExecuteInLine, that i sent to you yesterday:

There was some bugs when using collapsed line endings, and try to press enter, del, bkSpace at start/end of non collapsed lines.

And again some changes..

Complete CanExecute is now. It based on yours, but i renamed your tmp-vars:

It now modificate your case, if you press return on collapsed line. It set the cursor (quick and dirty) to another line and it works now. All other cases should be also ok.

LinesDeleted had to fill correctly the UndoBuffer and is now:


LinesInserted isnt changed i think:



Redo is now:


Undo is now:


Undo and Redo of deleting collapsed blocks works well now.


Remaining Error is now, if you delete 2 collapsed blocks... it crashs complete.  I search....

Это сообщение отредактировал(а) DavidCl0nel - 9.8.2006, 13:01

My two cents: =)

There was bug when you try to Ctrl-A, Ctrl-C file greater than 120kb with foldranges.
Memory leak and performance improve in TCustomSynEdit.GetSelText:

GetUncollapsedStrings returns not pointer but copy of strings. You allways need to free it. Same as you can't use GetUncollapsedStrings.Count because there will be memory leak, need to assign first.

I have drops of foldranges again, when highlighter is delphi =(. php highlighter works good. Simple open SynEdit.pas(400kb) in test programm, collapse line, place cursor to start of collapsed line and press Enter.

Hmm, it works good at me. I test it with SynEdit.pas and a little Add to "SynMemo1.CodeFolding.FoldRegions.Add(..)" for only an IF-Fold, and it looks ok, if i press return at start of line.

Maybe I missed a change here. I copy your "two cents"-Changes in mine and send it per mail.

Some hours sweat and work later....

Because of the problem, if i delete two blocks and Undo and Redo.... i had to redesign this function. And I think its very good now. In the last version I prevent the second Call fo fUndoList.AddChange with normal crDelete, because i have done this in my deleteLine-Function. This causes such errors.

Now he add 2 Undo Items, one "normal" for crDelete (it consist the lines except the collapsed lines around a block) and another crDeleteCollapsedFold which carry only the collapsed lines... better it carry the data-element for the collapsed lines. The undo (and redo later) only add this data in the array, and the complete code is back! It looks very simple now!



And here i could delete very very much. I hold the case for this "version" with VK_SHIFT and such, but it isnt needed anymore. In next version its "if selavail then Result := True" 




Look how easy Redo is now. The changes for Delete had to made, cause he keep SelText in Mind for Undo - but this SelText-function I rewrite to copy also the collapsed lines (you remember?). So i had to write a workaround here, that he only copy the normal lines around the collapsed lines.


Undo the same like Redo:



In the ExecuteCommand i got the same problem with SelText. Same Workaround.


And the last, also very important and the main issue, cause it needed so many hours... This function is called, if you add a item in the Undo or Redo-Structure... But it calls OnChange there, and in this method i call Rescanforfoldranges. And if i add a item in function LinesDeleted to the Undo-Structure it calls it and make many trouble.


I'm very glad that it works good and very simple.

Maybe i missed a change again, i send it by email.... 

Ok. =)
I've updated SynMix basing on your mail.
SynMix update 11/08/06 download (400kb)
There was also added //###mod uncollapse dont reset selection

Also here is small bug in CanExecuteInLine. 

There was missed 'if (FoldRange1=nil)' in last 'else'.

PS Here is ours test application
LeakTest (4kb)
You'll need to place test file named 1111.pas in folder of app. We usually use renamed SynEdit.pas as test =)
Also you need SynUniHighlighter - which allows to load highlighters in runtime. Not hardcoded in exe like original SynEdit.
SynUniHighlighter 2.0beta4 (77kb)
Also here used FastMM4, but of course can be commented out.
So in this test app are drops of foldranges:
Collapse line, place cursor to it's start, and press enter.
When using 'php.hgl' there no bug. Does it problem of SynUniHighlighter? =)

I tried your Leak-program, but i haven't the problems on enter on start of line. This works... Hmm.

But i found a other bug. If you press enter on end of line of a collapsed block, he uncollapse it correctly, and add the line after it. But the fold range start he also move one line after it. I look for it now.




But another thing.

I consider to reject the SelText-changes to its default old function. So he only copy the lines not the collapsed parts.
Reason: I had to make 2 workarounds in my last post for the Undo/Redo. Maybe i should reset SelText, then i dont need this workarounds.

For CopyToClipboard and CutToClipboard i can use the current SelText-function (Maybe i should rename it to SelCompleteText or such).

What do you think?

It's very strange that you don't have bug with drop of foldranges. What version of Delphi do you use? May be some bug in {IFDEF} code.

I think you need left it as is, it's right when in SelText stored all selected text, so i can use it in programm. If you rewrite CutToClipboard what will be with undo and SynEdit.SelText? 
May be it need to rewrite pressing enter at end of collapsed line, so it'll be no uncollapse but insert line after collapsed. If it's possible =)

Delphi5. Got some strange things with compiling SynUniHighlighter at first time with the Include of *.inc. Dont know, what he want, but later he compiles it only with some warnings, not with Errors... Anyway, i dont got the problems like you said it.
 
The remaining unclarity with D5 is also the "inherited" in the TSynEditCodeFoldingPlugin-Methods. I got a really hard crash, if Delphi5 should call inherited, because there are no inherited method, because it is abstract. You, with Delphi X (7? newer?), apparently don't have this problem, because your original source code has the inherited. Maybe you need it (but i couldn't imagine, what he should do there). Try to set a break point to it and have a look, what he does. If you need it (or if your compiler silent ignores it), the commented inherited should set in IFNDEF VER130.





Because of another bug at the workaround with SelText (Undo) I really did it. Before I write a workaround around the workaround, i decide to do this. Now I have a SelCompleteText (the current, called in CopyToClipboard, maybe we should think about the name a little bit) and the old SelText. All old functions, that call SelText, used the old one and we got the expected behavior. The CodeFolding-Feature is a Plugin and care about safe the collapsed parts, if it needs. The complete "model" looks better now.
Undo and Redo are in two parts (you have 2 structures in the Array), one that hold the "real" text, that was deleted (and this was made by the original code, without workarounds and such weird things) and the second new part with the folding-array-element made by TSynEditCodeFoldingPlugin.LinesDeleted. 



Another problem we should talk about...
In "TCustomSynEdit.UndoRedoAdded(Sender: TObject);" I commented the call of DoChange. In my program I call RescanForFoldRanges in the SynMemo.OnChange()-Event, because at this time he should update the foldranges, if you change the collapse-keywords. (And this is right, if I change the word "FOR" in source code to "F OR" the current block shouldnt exist any more).
The problem now wasm if I add a Undo at TSynEditCodeFoldingPlugin.LinesDeleted he called the UndoRedoAdded-Function (its looks right), this called OnChange-Event and this called RescanForFoldRanges and destroys the foldranges behind the back of LinesDeleted. If he returns to LinesDeleted he hasnt the same FoldRanges in the Array and you have the big problem.
So I decided to comment this OnChange - but this is also nonsense, now he never call OnChange-Event (weird...). So I can change FOR to F OR and he dont update all foldranges... This is crap.
Now I dont call Rescanforfoldranges in OnChange, only in Keyup, but this is also not enough. If I destroy a keyword with drag and drop for example he didnt updated it too. OnChange-Event is really the right place for it (And If you are dont allow to do that an other user of this SynMemo should know about this behavior...) This is no solution, but i have actually no idea, why this is the only place to call OnChange. If he add and Undo he maybe call the OnChange (because the Undo was added by changing text, so its right to call onchange...). But... I'm helpless at the moment.




The third thing is CanExecuteInLine. I dont thought of removing only some chars of a collapsed line... He should prevent it like before. So I added some code again to


The fUndoList really dont belong to this place, but the function, that called CanExecute... dont call LinesDeleted, if you select only one (and collapsed) line from beginning to the end. (this is the case in if-statement). So it is a little bit "dirt" in it I think.



And the last (see bug in last post)



I send a mail.


Remaining things:
 1. Delete a block, Undo, Redo, Undo, Redo... it crashs. 
 2. pressing enter at end of collapsed line, so it'll be no uncollapse but insert line after collapsed. If it's possible =) 
 3. Mark a collapsed line (not with Shift+END) with Shift+Down and delete, he dont delete the fold range.
 4. OnChange()-issue
 5. Rename the "new" SelCompleteText?
 6. On some cases he draw the [...]-Symbol at wrong places. Sometimes on the next line with a linebreak-sign in gutter (but on another line that is exactly as long as the error line he draw it right at the end of the text. Sometimes I see it nearly in the middle of the line (It was a short line).. Investigate this.

Это сообщение отредактировал(а) DavidCl0nel - 14.8.2006, 15:24

Can you mail me compiled leak.exe?

But in SynEdit no need to do this. Look at leak.exe, when i insert space in 'begin' it removes folding range ok.

Yes, it was bad.

Never try it before =)

it's an idea, but needs to test!

I compile test prog with fully your synedit.pas but it dont copy contents of collapsed string to clipboard. =( I see that code is in place but something wrong. I'll look at this more completely when got some time.
About bugN3 : it already was done, and now again =(

I think this name ok =)

Good luck in battle with bugs!

Copy collapsed text to Clipboard works good. (?) Hmm.

Bug 1 exists and only occur, if Rescan is called (see Bug4).

Bug 2 is impossible to solve, if I dont uncollapse the block and move caret, then he moves the folding range start (but it shouldnt), because he calles LinesInserted with FromLine-1. This -1 is the problem, that he update one line to early. But on other cases (return above collapsed blocks) it is needed so. So I decided to let it be. He dont destroy something yet and thats ok.

Bug 3 is solved.

Bug 4
I had to call RescanForFoldRanges... but i work with an own SyntaxHighlighter for my own language and add the folding infos in my code:


Maybe I should move this into the SyntaxHighlighter-class (but I have currently no idea how to do this), that the Highlighter should care about it (the destroyed keyword isn't in the keyword-color... this he has corrected).

Issue 5 is discussed and name is ok.

Bug 6 exists. Do you have something like this? It occurs it you have comments after the line, like


Then he draws the [..]-Symbol in "then begin" and not after comment. I search for this....




1+4+6 is left. I send you an email with both. In leak.exe the problem "enter on beginning" dont destroy the fold, but on some other cases with this huge file in it.

Это сообщение отредактировал(а) DavidCl0nel - 15.8.2006, 14:50

What should the modification do? It was the Bug6. I return it to the old simple calculation and it works good. Or this also work:

Why you set in nTokenLen Comments?

I dont know, what you want with Left and Right Offset of the Gutter, but it also works ok for the [...]-Signs. Maybe I take the second one.




Now I look for the Bug4-OnChange-behavior. This is the last problem I think.

It's all ok. I forgot to use SelCompleteText instead of SelText =) But now problem with Cut. It cuts some more lines, and Undo dont work correctly. So this was more better when you use SelText. I try to cut collapsed line in your leak.exe, and there is drop of foldranges.

It's very easy to write highlighter for any language for SynUniHighlighter. There is GUI highlighter designer too. Link to beta4 is lite version. Full version with demos can be downloaded from unihighlighter.com. So your prog will be more customizable =). Off: What program are you developing? Is there any test or beta to look?

No, i never see this bug. In compiled leak.exe that you send for me, it works ok too =) And there is very strange that there is no bug with drop of foldranges. I'll try to find it, but think that i need Delphi5 =) I use BDS2006 now.

It moves [...] sign inside open/close CF-token. You can see it only when CF-range use 'add closing keyword when collapsing' option set. So there will be no:
begin end [...]
but:
begin [...] end

Because it is'n need here. Left position calculates from left corner, and no need to know length of closing token.

Next found bugs: =(
7. pressing Enter on start of line after collapsed don't move line contents to next line, only moves cursor
8. copy collapsed line and try to paste it to start of next line after collapsed, foldrange moves one line bottom. If i paste simple text block, then all ok.

>>Off: What program are you developing? Is there any test or beta to look?

It is a editor for an own scripting language. No beta, it need to many settings and "environment" around it. And its only _one_ language, so i dont want to use the unihighlighter. Its only overhead, because i dont want to swap the language/highlighter. So i had to to Bug4 on another way.


I have also this Cut-Problem... i will look at it.



begin [...] end
Ok, i dont use it like that, but if you set the sign to another position you should check, if this end-option is on. On my cases it looks like "if a <[...] then // more comment" - In the middle of the line. Thats not right and I change it to the old one and he draw it always on the end. And for this  nTokenLen is needed.

But there I found another bug. If I set the font size to something big (ie 16 instead of 10) the folding-gutter with the [-] is cut off a little bit (12) or completely cut (16+). I dont found the exactly position at the moment, but i will look at it.


7. ... ok... 

8. Gna! 

I changed again CanExecuteInLine. 7+8 should work now. Try it with the other problem too.


Without the -1 now:


With <= instead of only <:




Actual bug list:
1. begin [...] end. I changed it to old version. It works good at all other cases. Your case (if with endings) had to catch there and take your code. But at this place you cant get to this attribute "fAddEnding". It is in class "TFoldRegionItem" and not in the FoldRange "TSynEditFoldRange". Dont know how to get the information (if fAddEnding or not) in the paint-function.

2. If I set the font size to something big (ie 16 instead of 10) the folding-gutter with the [-] is cut off a little bit (12) or completely cut (16+). I dont found the exactly position at the moment, but i will look at it.

3. Cut-Problem: It cut the right, but deletes too much.

4. OnChange()-issue.







Edit:

3:

SelCompleteText change (no idea why at the moment) the Selection. He copy the right thing, change the selection to some more lines and delete this with more. With this torkaround he reset it to origin place. But Undo didnt work at the moment...
But the real solution should prevent the selectionchanging in SelCompleteText.

Это сообщение отредактировал(а) DavidCl0nel - 16.8.2006, 15:20

Ok.. SelCompleteText changed the Selection, because it called GetUncollapsedStrings. This function called UncollapseAll and there you have changed some in last week. If you uncollapse you convert the selection. At a normal case this is ok, but on my SelCompleteText-case not.  So I moved the workaround at beginning and end to SelCompleteText.



Another thing is the CutToClipboard-function. He doesnt mind the SelText in Undo-Buffer, so I had it to change:

For normal Undo it is necessary to Undo first the collapsed-part (add this item back into array) and then the deleted text of SelText, so I had to buffer the selection (BB/BE) and the text.



The undo-function add the stored fold to the end of the array, but this wasn't ok for most cases. If I cut the first collapsed block for example and Undo it, he add this fold range at the end of the array. He shows it at the right place, but if you want to uncollapse it, it draw wrong lines in the gutter. So I had to change it, to Insert it at the right place with the line number. Then the problem is solved.


Now it works with Cut, Undo, Redo, Undo, ...


But i found another bug. (gna!) If you collapse the last possible fold range and want to copy it, it crashs with RangeError in Array. It occurs with my RescanForFoldRanges-Call in OnKeyUp(). (In OnChange() I doesnt call it anymore, only there... but this cause this problem.

So its ok and the current bug list is:
1. begin [...] end. I changed it to old version. It works good at all other cases. Your case (if with endings) had to catch there and take your code. But at this place you cant get to this attribute "fAddEnding". It is in class "TFoldRegionItem" and not in the FoldRange "TSynEditFoldRange". Dont know how to get the information (if fAddEnding or not) in the paint-function.

2. If I set the font size to something big (ie 16 instead of 10) the folding-gutter with the [-] is cut off a little bit (12) or completely cut (16+). I dont found the exactly position at the moment, but i will look at it.

3. Cut-Problem solved.

4. OnChange()-issue.


Это сообщение отредактировал(а) DavidCl0nel - 17.8.2006, 14:41

i no need to check it =) I haven't bug you describe. In this mod there are code where added 5 spaces, so [..] sign never painted over text.

This is known bug. You can't assign different fonts to gutter and textarea. Only few monospaced font are compatible, but need to find their size. It's because use of CharWidth variable when calculate gutter, but this variable holds charwidth of textarea.

I test your version from 16/08. Sorry but i stll use some fixed version of synmix from 11/08 because there are a lot of new bugs. And i don't very like idea about SelCompleteText. Because there is shortcuts like Shift+Ins that copy selection with no executing CopyToClipboard. 
May be you need to return some back to version 11/08 ? =)
Found bugs that wasn't in 11/08:
- uncommenting of 

gives error 'incompatible types' for me =(
- press Enter at start of line with foldrange don't move foldrange to line below
- press BkSpace at start line with foldrange delete this foldrange
- copy collapsed string delete its collapsed text
e.t.c! 
so there very lot of critical bugs =(

In version 11/08 i edit copy collapsed string moves selection bug like you write here, and some patch needed to my prog:
MouseWhell only scroll text when cursor over textarea. I need it because in my prog need to scroll two windows by Wheel without moving focus.

And there was returned 0 when asking before paint. So rows wasn't yet calculated.

>> no need to check it =) I haven't bug you describe. In this mod there are code where added 5 spaces, so [..] sign never painted over text
Sure it cause problems, but only in the case if you have //comment at the end of line. This token he cant see correctly and set the [...] sign in the middle of the line above the code. Thats not good and so i stay at my version, cause i didnt want this ending.



>>This is known bug
Bad, but ok.



>>May be you need to return some back to version 11/08 ? =)
Send it back to me with all your changes you made since now. But I only do it, if this was the first version with the correct Undo/Redo with copying the fold in the UndoBuffer, not set Caret and Insert the Text. This was a difficult and bad way. There are maybe many bugs, if you do it this way. But I had change some of mine things too, because some are important. SelCompleteText or not is ok, but all other (InsertLines-1..) should be ok...



>>gives error 'incompatible types' for me =(
What? Compile error or what you mean?



On my last version I couldnt see such bugs, it works on all cases, he copy and cut the right things and so on. I cant imagine what the problem is.

Here is screenshot with endings in CF-rule

and without endings


 Of course, you told this in first posts in this thread. I only want to say that there no bug for me =)


No problems =) But changes aren't major. I don't have so much time to improve component, there only small fixes.

Yes, it is compile error =(

I can send compiled version, if it helps... =)

>>Here is screenshot with endings in CF-rule
I show you on Monday a screenshot with the error 

Do you have sent the source code of 11.08. with your changes? I havent got something till now.

Yes, of course. Now i send once more. May be try to other your mail? Or you can download SynMix, there was very little changes in it since upload.

OFF:
best prog i've seen to compare sources - WinMerge, and it is free.

Это сообщение отредактировал(а) Sep. - 20.8.2006, 08:21

Your mail was catched by spam filter, i saw the second one moving in the spam-folder and could move it back. Your first mail was deleted I think, because the spam box was deleted to early (one day i think).

I had to change the workarounds a little bit

The other workaround in the Redo-case like this one. Check your mail with the complete source.

I hope you have now no errors like me.

PS: I merge it with TotalCommander Compare. ;)

Some other changes, please test it with these little changes.

After Pasting I had to call RescanForFoldRanges, to get the new FoldRange work. Please test it with and without this change. Maybe your control update it correctly like on destroying fold-marker (for -> f or). The OnChange-issue...




Delete had to changed. In older version i cant delete the line between two blocks (If-block, free-line, other-if-block. Put cursor at begin of free line and press delete - it will be ignored). So this change:




And the Plugin-functions changed once again. I decided to rewrite the LinesInserted for the Return-At-Begin-On-Line-Case.




Edit:

And very important. The OnChange-issue:


I have my FoldRegion-Infos in the Control, not in the Highlighter. (i set it if i create a form in my source code with all keywords for folds). And in my highlighter I dont have this information, so he dont do something and exit the function. With my change he looks also in the Control, if the Flag is set. Now it works (for -> f or). Great. 





Last Bug I found:
 - Copy something in LineSelect-Mode. If you insert it somewhere, it overwrite the text. If you paste it in an simple text editor and recopy it and paste it in Syn it works. Something is wrong in the SpecialClipboardFormat.

Это сообщение отредактировал(а) DavidCl0nel - 21.8.2006, 14:53

I cant test it because of bug in delphi highlighter with drop of foldranges. But i see that func is called and other foldranges don't crush =) (In php HL there one char foldranges.)

Viva!

strange =( and when i copy text in LineSelect and try to paste in NormalSelect it paste nothing

I added code from last your post to code from your mail and have now this bugs =(:
1. when select all collapsed line in NormalSelect and delete - there left [+] on gutter. And undo don't return collapsed text.
2. if select this line by click on gutter and delete - text of line deletes, but foldrange dont deletes and moves one string above

It because of -1 here. For what it needed?
And i still search for FreeMem(IndentGuides); error. May be i need to write freeing of array of array manually. 
Nobody to ask for, because Vitalik have no internet connection for 3 weeks =(

My last bug is still exists. If I use NormalInsert instead of LinesInsert (there are a Case that decide this) I can insert it "correct", but LineInsert should insert it on another way. But I have some errors if i Undo this block-paste.
Edit: It occurs because Undo want to delete the pasted block and this called LinesDeleted. And LinesDeleted fill the Undo-Buffer again with the collapsed fold. After LinesDeleted he also undo this element and restore the collapsed text again. Not really what i want. ;) Dont know at the moment, how to prevent this.

One other error was with selecting a complete line next to a collapses line. There he start at wrong position and copy also the collapsed lines. I have corrected it and I send you later a mail with the corrected. Another little fix is needed in LinesInserted too.

Your problems:
1. Yes  If I select and delete only 4 of 5 folds he can undo it correct... Hmm. I will look at it.
Solution in UndoItem: If nothing is in, he cant go through the array and cant add. Fixed.


2. -1 was needed sometimes. There are so much cases, and for some I test it with and without -1. I cant remember for what -1 was good.
Now I dont have this -1.
PS: Click on Gutter select the line? Dont have this feature. He collapse and uncollapse the block.
Edit: If you put cursor one line above a block (collapsed or not collapsed, no matter) - its a free line - and press DEL-Key, he deletes the foldrange in this function because of no -1. This case had to catched on some way.
Solution:

There was a CaretY+1, but i dont know, why it should added 1.

3. FreeMem compiles good. But in whole function the IndentGuides only is filled and needed in commented lines. Nobody use it and you can delete the variable.

Это сообщение отредактировал(а) DavidCl0nel - 22.8.2006, 12:30

This I could only solve with an interface change.  I dont like it, but it is needed. This function should decide, if add to undo list or not.
Also an other -1 was wrong in this function (UpdateFoldRanges). Now it looks like:

Following functions had to change. The "upper" functions dont need it, but had to pipe it to the last function, where it is needed.
TCustomSynEdit.DoLinesDeleted(FirstLine, Count: integer; AddToUndoList: Boolean);
TSynEditPlugin.LinesDeleted(FirstLine, Count: integer; AddToUndoList: Boolean); virtual; abstract;
TSynEditCodeFoldingPlugin.LinesDeleted(FirstLine, Count: integer; AddToUndoList: Boolean); override;


LinesInserted was changed a little bit. New is the Collapsed-Check.


GetSelText copy a line to early. Fix is in For-loop with First+1:




Another bug is in the workaround for GetSelText. This workaround should copy the right parts of course. So it had to make different things in all 3 selection modes.

In ExecuteCommand it is now much more difficult:


In SetSelTextExternal it is the same. (Copy this block and rename the variable from sText to it)



That is why i original think of SetCompleteText..... So it is a little bit difficult, but it works now. But i dont like it.


I send a mail with complete source.


I think I now have found and fix the most common problems. I hope it... It must have an end sometime....

Это сообщение отредактировал(а) DavidCl0nel - 22.8.2006, 15:12

You need click and drag mouse down or up to select lines

It's need to edit another DoLinesDeleted(CaretY{+1}, 1); too in ecDeleteLastChar: to prevent drop of foldrange when press BkSpace on start of line with foldrange.
[quote]IndentGuides. Nobody use it and you can delete the variable.[/qoute]
Heh=) And you may comment out 'SynRegExpr' in uses clause, it not used too.

Ok, but mail differs from your last post =). I added code in last post and test it.

Great! Bug with column select , delete and undo deleteion fixed! I found small bugs:
1. Bug when cursor at end of line with foldrange and press BkSpace - drop of current foldrange
2. When delete line before last string of foldrange then start of foldrange moves one line down

There are bug with keystrokes. If i assign to any of it shortcut:=0 (none) Then it thinks that key=0 toggles it. But in onKeyDown assigment of key=0 (i cant assign to it -1) is stops processing key. Need to edit SynKeyCmds.pas

and

Heh, some error =): you write 

There another error
3.  Press Ctrl-A and then any letter - will get AV. If there not full text selected - then all ok. Looks like bug in SetSelTextPrimitiveEx but i cant find it =(

>>It's need to edit another DoLinesDeleted(CaretY{+1}, 1); too in ecDeleteLastChar: to prevent drop of foldrange when press BkSpace on start of line with foldrange.

Ok



>>There are bug with keystrokes

I dont know, what you do with keystrokes, but ok. ;)

>>1. Bug when cursor at end of line with foldrange and press BkSpace - drop of current foldrange
I cant press BkSpace there. It is ignored.

>>2. When delete line before last string of foldrange then start of foldrange moves one line down
Yes. It was CanExecuteInline.

There was a CaretY+1.

>>Heh, some error =): you write 
Yes i found it today. It should be on both BlockEnd.

Another change with Undo for Clipboard:


And in SetSelTextExternal..
 The StartOfBlock and EndOfBlock.


In RedoItem is the third place for the case (i dont like it - really)

Then Undo-Redo-Undo works for Cut and Delete a fold.


>>3.  Press Ctrl-A and then any letter - will get AV. If there not full text selected - then all ok. Looks like bug in SetSelTextPrimitiveEx but i cant find it =( 

No. But maybe it is solved with upper changes.




Other question:
On PaintLines for Drawing the indentGuides for non collapsed folds, why you have this:

I like it, if it is the current fold of cursor, that he draw the line in Red. Why you set it here to other things and draw it gray?






Edit: I found a very tiny bug with the IndentGuides on one situation. If you have a Keyword for FoldEnd similar to FoldStart (for example IF-ENDIF) he found after END (if you set the cursor there) the new IF and think he found a new Fold and dont draw the IndentGuides correctly in red.

Fix is:

With this new if Pos he dont make this little failure and draw the IndentGuides in whole keyword.



Last Edit:
LinesInserted was wrong, if you insert a line in a block. Then he moves the complete foldrange, with start... Not right. It is now:



And now I send a email.

Это сообщение отредактировал(а) DavidCl0nel - 23.8.2006, 15:16

Today fixes: 


If you select from back to end a word or more lines and delete it, the UndoBuffer (in one of this workarounds) isnt filled correctly, because of the wrong "direction". This fix always set BlockEnd after BlockBegin.





Maybe I edit some other changes in this post later, but it looks good yet. 

Looks more stable than ever!
 Now we can update SynMix. Next step to excelence =)
 
 SynMix update 24/08/06 great thanx to DavidCl0nel
 download 400kb
 
 
 I have this only for more bolder visual appearance of highlighted indent guide. It draws only even dots in normal state. I did that it first draw line under these even dots - so looks more bolder.
 
 
 Seems like it is bug of Syn, because work good in LeakTest =( Strange...
 
 Some non-common bug of original CF left. May be now its time for it? =)
 1. Select collapsed line from start to end by mouse in NormalSelect. Then paste above collapsed line - it'll paste without colapsed text and drop of foldrange of collapsed line.

>>I have this only for more bolder visual appearance of highlighted indent guide. It draws only even dots in normal state. I did that it first draw line under these even dots - so looks more bolder

Ok, but then you have to reset the color to the original (in this case red), not in all cases back to black. You should buffer the color in a variable or make the decision after your extra bold line.


>>1. Select collapsed line from start to end by mouse in NormalSelect. Then paste above collapsed line - it'll paste without colapsed text and drop of foldrange of collapsed line. 

Hmm, a little bit yes. Paste without collapsed text is true, but he don't drop the fold. I had to catch this case in CopyToClipboard (CutToClipboard the same). But I don't know, if I have time for it today.

But color already backuped above:
OldColor := Canvas.Brush.Color;
and restored after.

It will be great, if there willn't be workaround in CopyToClipboard. Because it don't called when Ctrl-V / Ctrl-C. It only called by program. Strange that i have drop of foldrange. May be again Delphi5 =)

Ok, there some small fixes.
Wrong working if you select text by mouse from right to left (BlockBegin greater than BlockEnd)

and

Sometimes dont called OnGutterClick method when WordWrap enabled. Need to edit TCustomSynEdit.DoOnGutterClick

and allways copy to clipboard in unicode if possible. It usefull only for russian locale i think.

The Paint Problem with IndentGuides:
This is no fixed Code, only with my comments (<-->), that you see the problem:



Solution would be, that you make the decision Red or not Red after your bold line.



And the fix for missing Update of foldranges, if keywords are case-sensitive:

Thats all.



Now i try to search the Copy/Cut-Problem.

 Now i understand about what you say. =) I think that mod named "IndentGiudes change highlight" can change color too. =) Of course there can be backup of color done. But i use Black, if you need Red, you can change this in mod. If mod not instaleed then all by default. If there made backup of color, then mod need to rename to "IndentGiudes change highlight style" =) You think it's important? Then i will do it.
 
 will add to next SynMix release

Write your mod like this:

Canvas.Pen.Color := clGray || clRed; // if...
OldColor := Canvas.Pen.Color;
Canvas.Pen.Color := clGray;                               // mod..
Canvas.MoveTo(X, Y);                                      //
Canvas.LineTo(X, rcLine.Bottom);                          //
Canvas.Pen.Color := OldColor;                              //
...//draw guides


Then it should be what you want - a gray line behind the indent guide line.
I dont use the mod anyway. But you should do this in SynMix.






Copy-Problem:

Now he copy the foldrange, if you select until the last character of fold line (only then).


And also CutToClipboard copies the right text in clipboard, but dont delete fold range. I will fix this now.
Edit: One problem is, that Cut dont call CanExecuteInLine, so you can cut a hald line of collapsed fold range...




PS: I have problems with login in forum now. (logout every post) Is this my cookie-problem or is it a failure with the forum?




Edit: Cut-Problem solved with:


He called the function, but didnt do something, because Count was 0 (sure if you select only from beginning to end of line). Now he deletes the fold correctly.

Remaining thing is that you are allowed to Cut something in a collapsed line. Delete is forbidden there, but cut works... Mmh.


Fix:

But the call of CanExecute is maybe not really good there, if you call Cut on another way. But I have no idea where. Sure I can forbid it in SetSelTextExternal, but then the text was already copied, so i only forbid the half thing. 

PS: I had again login into forum, what is the problem.

Это сообщение отредактировал(а) DavidCl0nel - 4.9.2006, 11:17

I can't reuse OldColor because it already holds color. I rewrite with other variable.

One more bug fixed =)

When i press hotkey, it converts it to ComandProcessor word and then there is case:

So it run CopyToClipboard from everywhere. This all ok, i miss it. 
But there some bug in your new code that you mail me: =(
When i select string from start to end and press Ctrl-C then i have drop of current foldrange. It copyes to buffer ok, and i can press Ctrl-Z to return it back.
Ctrl-X works ok in that case.
I can send compiled version to you. Again Delphi5 case?

OFF:

What browser do you use? I have problems with post messages under Opera9, it have no button 'Send' for me. Under IE all ok. There many users have this bug, it posted in support topic on this forum. But i cant see topic about login problems. May be some cookie problem, untrusted site e.t.c.