misc/notepadplus: add interface to function list and use clang color in comments

R=golang-dev, bradfitz
CC=golang-dev
https://golang.org/cl/13587043

diff --git a/misc/notepadplus/functionList.xml b/misc/notepadplus/functionList.xml
index 6e00305fa37dd2fa08826ea8099091827b729013..ca949f01848259e85aea01389c3cbabb3b0f0200 100644 (file)
--- a/misc/notepadplus/functionList.xml
+++ b/misc/notepadplus/functionList.xml
@@ -6,6 +6,23 @@
                <!-- </associationMap> -->
                <!-- <parsers> -->
                        <parser id="go" displayName="Go" commentExpr="((/\*.*?\*)/|(//.*?$))">
+                               <classRange
+                                       mainExpr="^type\s+\w+\s+interface\s*\{"
+                                       openSymbole = "\{"
+                                       closeSymbole = "\}"
+                                       displayMode="node">
+                                       <className>
+                                               <nameExpr expr="type\s+\w+"/>
+                                               <nameExpr expr="\s+\w+"/>
+                                               <nameExpr expr="\w+"/>
+                                       </className>
+                                       <function
+                                               mainExpr="^\s+\w+\s*\(">
+                                               <functionName>
+                                                       <funcNameExpr expr="\w+"/>
+                                               </functionName>
+                                       </function>
+                               </classRange>
                                <function
                                        mainExpr="(^func\s+\w+)|(^func\s*\(\s*\w*\s*\*?\s*\w+\s*\)\s*\w+)"
                                        displayMode="$className->$functionName">

diff --git a/misc/notepadplus/userDefineLang.xml b/misc/notepadplus/userDefineLang.xml
index 0c713ec9ef627eb51923de5f00f38029f653571b..10093db2d1a66d4d6bed572ab71d8678442476c3 100644 (file)
--- a/misc/notepadplus/userDefineLang.xml
+++ b/misc/notepadplus/userDefineLang.xml
@@ -36,8 +36,8 @@
         </KeywordLists>
         <Styles>
             <WordsStyle name="DEFAULT" fgColor="000000" bgColor="FFFFFF" fontName="" fontStyle="0" nesting="0" />
-            <WordsStyle name="COMMENTS" fgColor="AAAAAA" bgColor="FFFFFF" fontName="" fontStyle="0" nesting="0" />
-            <WordsStyle name="LINE COMMENTS" fgColor="AAAAAA" bgColor="FFFFFF" fontName="" fontStyle="0" nesting="0" />
+            <WordsStyle name="COMMENTS" fgColor="008000" bgColor="FFFFFF" fontName="" fontStyle="0" nesting="0" />
+            <WordsStyle name="LINE COMMENTS" fgColor="008000" bgColor="FFFFFF" fontName="" fontStyle="0" nesting="0" />
             <WordsStyle name="NUMBERS" fgColor="A52A2A" bgColor="FFFFFF" fontName="" fontStyle="0" nesting="0" />
             <WordsStyle name="KEYWORDS1" fgColor="AA0000" bgColor="FFFFFF" fontName="" fontStyle="1" nesting="0" />
             <WordsStyle name="KEYWORDS2" fgColor="AA0000" bgColor="FFFFFF" fontName="" fontStyle="1" nesting="0" />