forks
/
dlangui
mirror of https://github.com/buggins/dlangui.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

support toggle line and block comments in editors

This commit is contained in:
Vadim Lopatin 2015-02-09 10:11:26 +03:00
parent 6bb69b2471
commit ed6d2df29a
2 changed files with 35 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/dlangui/core/editable.d
View File

@ -404,6 +404,18 @@ alias TokenPropString = ubyte[];
interface SyntaxHighlighter {
/// categorize characters in content by token types
void updateHighlight(dstring[] lines, TokenPropString[] props, int changeStartLine, int changeEndLine);
/// return true if toggle line comment is supported for file type
@property bool supportsToggleLineComment();
/// return true if can toggle line comments for specified text range
bool canToggleLineComment(EditableContent content, TextRange range);
/// toggle line comments for specified text range
void toggleLineComment(EditableContent content, TextRange range, Object source);
/// return true if toggle block comment is supported for file type
@property bool supportsToggleBlockComment();
/// return true if can toggle block comments for specified text range
bool canToggleBlockComment(EditableContent content, TextRange range);
/// toggle block comments for specified text range
void toggleBlockComment(EditableContent content, TextRange range, Object source);
}
/// editable plain text (singleline/multiline)

30
src/dlangui/widgets/editors.d
View File

@ -907,13 +907,27 @@ class EditWidgetBase : ScrollWidgetBase, EditableContentListener, MenuItemAction
/// override to handle specific actions state (e.g. change enabled state for supported actions)
override bool handleActionStateRequest(const Action a) {
switch (a.id) {
case EditorActions.ToggleBlockComment:
if (!_content.syntaxHighlighter || !_content.syntaxHighlighter.supportsToggleBlockComment)
a.state = ACTION_STATE_INVISIBLE;
else if (_content.syntaxHighlighter.canToggleBlockComment(_content, _selectionRange))
a.state = ACTION_STATE_ENABLED;
else
a.state = ACTION_STATE_DISABLE;
return true;
case EditorActions.ToggleLineComment:
if (!_content.syntaxHighlighter || !_content.syntaxHighlighter.supportsToggleLineComment)
a.state = ACTION_STATE_INVISIBLE;
else if (_content.syntaxHighlighter.canToggleLineComment(_content, _selectionRange))
a.state = ACTION_STATE_ENABLED;
else
a.state = ACTION_STATE_DISABLE;
return true;
case EditorActions.Copy:
case EditorActions.Cut:
case EditorActions.Paste:
case EditorActions.Undo:
case EditorActions.Redo:
case EditorActions.ToggleBlockComment:
case EditorActions.ToggleLineComment:
case EditorActions.Tab:
case EditorActions.BackTab:
case EditorActions.Indent:
@ -2024,12 +2038,14 @@ class EditBox : EditWidgetBase {
}
}
return true;
case EditorActions.ToggleLineComment:
// TODO
return true;
case EditorActions.ToggleBlockComment:
// TODO
return true;
if (_content.syntaxHighlighter && _content.syntaxHighlighter.supportsToggleBlockComment && _content.syntaxHighlighter.canToggleBlockComment(_content, _selectionRange))
_content.syntaxHighlighter.toggleBlockComment(_content, _selectionRange, this);
return true;
case EditorActions.ToggleLineComment:
if (_content.syntaxHighlighter && _content.syntaxHighlighter.supportsToggleLineComment && _content.syntaxHighlighter.canToggleLineComment(_content, _selectionRange))
_content.syntaxHighlighter.toggleLineComment(_content, _selectionRange, this);
return true;
case EditorActions.InsertLine:
{
correctCaretPos();