|
|
static.png (5,295 bytes) |
|
|
synhighlighterpas-typehelpers-01.patch (2,974 bytes) |
|
|
Patch attached |
|
|
Needs a bit more work Example below. Type a = type b; This will open a block, and cannot be avoided (same like "class of TFoo"). But it must be prevented to have any other consequences. Such as "MyRec", which does not close at all. Also the outline markup now colors the word type. I think it would be better to start the block on "helper". (Since outline can only do one word). That would also solve the accidentally opened blocks. Keeping it on "type" and trying to workaround like for "class of" would likely be to complex, because there can be other blocks inside. Also (like "class of") it would lead to wrong fold and outline. For "class of" this will one day mean a bigger refactor... And since there now is a flag, if typehelpers are active, could it be used for *not* marking "helper", if it is off. See "MyBool", if the modeswitch is off. -- Actually, if and only if it is on one line (with no comment in between) then both word could be a token together, and the start could be "type helper" (imho without the "for"). This would require to look ahead at the next word. But if "type" is followed by either a comment or line end, then it would need to set a flag, so that "helper" can be found, if it happens to follow. It is not possible to scan ahead to the next line(s). This will lead to later errors, when editing lines. -- Let me know, if you want to work on a new patch. Otherwise I will look at it in a bit. Testcase would also be welcome ;) program Project1; {$mode objfpc} {$modeswitch typehelpers} type helper = boolean; MyRec = type { foo bar } record o: integer; end ; MyInt = type { foo bar } integer ; //MyBool = // only if typehelpers are off // type // { foo bar } // helper //; TFoo = class of TObject ; TTest = type { abc } helper {def} for integer private const B = 2; public class function A: Integer; static; end; class function TTest.A: Integer; begin Result := B; end; begin end. |
|
|
Huh I see now that the problem is more complex than I thought. Thank you for the detailed description. I assume I'd be able to limit the block to only "type helper" with some kind of flag, but I will rather leave it to you - you will do it better. |
|
|
Please test and close if ok. Note, there is a minor inconsistency. TFoo = class helper for xxx // folds at class TBar = type helper for xxx // folds at helper This also affects how word-pairs (caret at class/end or helper/end) are shown. |
- Anonymous
