[NEW] Add C# in Function List.

[BUG_FIXED] Add "Block Uncomment" command in the Shortcut Mapper.

git-svn-id: svn://svn.tuxfamily.org/svnroot/notepadplus/repository/trunk@1281 f5eea248-9336-0410-98b8-ebc06183d4e3
This commit is contained in:
Don Ho 2014-10-28 22:09:55 +00:00
parent daf42f1d62
commit 57633249ab
2 changed files with 24 additions and 0 deletions

View File

@ -118,6 +118,7 @@ WinMenuKeyDefinition winKeyDefs[] = {
{VK_K, IDM_EDIT_BLOCK_COMMENT_SET, true, false, false, NULL}, {VK_K, IDM_EDIT_BLOCK_COMMENT_SET, true, false, false, NULL},
{VK_K, IDM_EDIT_BLOCK_UNCOMMENT, true, false, true, NULL}, {VK_K, IDM_EDIT_BLOCK_UNCOMMENT, true, false, true, NULL},
{VK_Q, IDM_EDIT_STREAM_COMMENT, true, false, true, NULL}, {VK_Q, IDM_EDIT_STREAM_COMMENT, true, false, true, NULL},
{VK_NULL, IDM_EDIT_STREAM_UNCOMMENT, false, false, false, NULL},
{VK_SPACE, IDM_EDIT_AUTOCOMPLETE, true, false, false, NULL}, {VK_SPACE, IDM_EDIT_AUTOCOMPLETE, true, false, false, NULL},
{VK_SPACE, IDM_EDIT_AUTOCOMPLETE_PATH, true, true, false, NULL}, {VK_SPACE, IDM_EDIT_AUTOCOMPLETE_PATH, true, true, false, NULL},
{VK_RETURN, IDM_EDIT_AUTOCOMPLETE_CURRENTFILE, true, false, false, NULL}, {VK_RETURN, IDM_EDIT_AUTOCOMPLETE_CURRENTFILE, true, false, false, NULL},

View File

@ -21,6 +21,7 @@ http://notepad-plus-plus.org/features/function-list.html
<association langID="1" id="php_function"/> <association langID="1" id="php_function"/>
<association langID="2" id="c_function"/> <association langID="2" id="c_function"/>
<association langID="3" id="c_cpp_function"/> <association langID="3" id="c_cpp_function"/>
<association langID="4" id="cs_function"/>
<association langID="6" id="java"/> <association langID="6" id="java"/>
<association langID="9" id="xml_node"/> <association langID="9" id="xml_node"/>
<association langID="12" id="batch_label"/> <association langID="12" id="batch_label"/>
@ -231,6 +232,28 @@ http://notepad-plus-plus.org/features/function-list.html
</function> </function>
</parser> </parser>
<parser id="cs_function" displayName="C# Class" commentExpr="((/\*.*?\*)/|(//.*?$))">
<classRange
mainExpr="^[\t ]*((public|protected|private|internal)[\s]+)?([\w]+[\s]*)?(class|struct|interface)[\t ]+[^\{]+\{"
openSymbole = "\{"
closeSymbole = "\}"
displayMode="node">
<className>
<nameExpr expr="(class|struct|interface)[\t ]+[\w]+"/>
<nameExpr expr="[\t ]+[\w]+"/>
<nameExpr expr="[\w]+"/>
</className>
<function
mainExpr="^[^\S\r\n]*(?&lt;modifier1&gt;(?:public|protected|internal|private)\s*)?(?&lt;modifier2&gt;(?:new|static|virtual|sealed|override|abstract|extern)\s*)?(partial\s*)?(?&lt;type&gt;(?!(return|if|else))\w+(?&lt;genericType&gt;&lt;[\w,\s&lt;&gt;]+&gt;)?\s+)(?&lt;name&gt;\w+(?&lt;genericNameType&gt;&lt;[\w,\s&lt;&gt;]+&gt;)?\s?)\((?&lt;params&gt;[\w\s,&lt;&gt;\[\]\:=\.]*)\)(?&lt;ctorChain&gt;\s*\:\s*(?:base|this)\s*\((?&lt;ctorParams&gt;[\w\s,&lt;&gt;\[\]\:=\.]*)\))?[\w\s&lt;&gt;\:,\(\)\[\]]*(?:\{|;)">
<functionName>
<funcNameExpr expr="(\w+(&lt;[\w,\s&lt;&gt;]+&gt;)?\s?)\("/>
<funcNameExpr expr="(\w+(&lt;[\w,\s&lt;&gt;]+&gt;)?\s?)"/>
</functionName>
</function>
</classRange>
<function mainExpr="">
</function>
</parser>
</parsers> </parsers>
</functionList> </functionList>
</NotepadPlus> </NotepadPlus>