Skip to content
This repository
Browse code

applying patch 9 from ticket #47

  • Loading branch information...
commit 9fe50c43a918404eb3719707094430a9b2858100 1 parent b514517
Tom Hickey thickey authored
1  netbeans/plugins/org-enclojure-plugin/pom.xml
@@ -683,6 +683,7 @@
683 683 <include>Bundle.properties</include>
684 684 <include>**/*.png</include>
685 685 <include>**/*.gif</include>
  686 + <include>**/*.clj</include>
686 687 </includes>
687 688 <targetPath>org/enclojure/ide/nb/editor/resources</targetPath>
688 689 </resource>
27 netbeans/plugins/org-enclojure-plugin/src/main/java/org/enclojure/ide/nb/editor/Bundle.properties
@@ -40,4 +40,29 @@ CTL_AttachDebugProjectWithReplAction=Attach Debugger to Project REPL
40 40 CTL_DetachDebugProjectWithReplAction=Detach Debugger from Project REPL
41 41 CTL_LoadAllSourcesAction=REPL->Load-all Clojure Files in "%s"
42 42 LBL_Maven_Quickstart_Archetype="Clojure quick start archetype"
43   -HINT_MavenQuickStart="clojure-quickstart"
  43 +HINT_MavenQuickStart="clojure-quickstart"
  44 +text/x-clojure=Clojure
  45 +char=Character
  46 +symbol=Symbol
  47 +map-start=Map Start
  48 +any=Any
  49 +map-end=Map End
  50 +vec-end=Vector End
  51 +list-start=List Start
  52 +keyword=Keyword
  53 +deref=Deref
  54 +list-end=List End
  55 +meta=Metadata
  56 +string=String
  57 +vec-start=Vector Start
  58 +number=Number
  59 +unquote=Unquote
  60 +comment=Comment
  61 +quote=Quote
  62 +function=Function
  63 +macro=Macro
  64 +ns-publics=Namespace Publics
  65 +ns-interns=Namespace Interns
  66 +ns-imports=Namespace Imports
  67 +compiler-special=Compiler Special
  68 +error=Error
71 netbeans/plugins/org-enclojure-plugin/src/main/java/org/enclojure/ide/nb/editor/ClojureFontsColors.xml
... ... @@ -1,34 +1,47 @@
1 1 <?xml version="1.0" encoding="UTF-8"?>
2 2 <!DOCTYPE fontscolors PUBLIC "-//NetBeans//DTD Editor Fonts and Colors settings 1.1//EN" "http://www.netbeans.org/dtds/EditorFontsColors-1_1.dtd">
3 3
4   -<!--
5   -.comment { color: gray; }
6   -.string { color: teal; }
7   -.function { color: #00c; }
8   -.macro, .specialops { color: #60c; }
9   -.parens { color: #000; }
10   -.keyword { color: #c09; }
11   -.brackets { color: #006; }
12   -.curlybrackets { color: #906; }
13   --->
14   -
15 4 <fontscolors>
16   - <!--<fontcolor name="comment" foreColor="ff000000" default="default" />-->
17   - <fontcolor name="any" foreColor="ff000000" default="default" />
18   - <fontcolor name="char" foreColor="ff006600" default="default" />
19   - <fontcolor name="symbol" foreColor="ff000000" default="default" />
20   - <fontcolor name="string" foreColor="ff008080" default="keyword" />
21   - <fontcolor name="list-start" foreColor="ff000000" default="keyword" />
22   - <fontcolor name="list-end" foreColor="ff000000" default="keyword" />
23   - <fontcolor name="keyword" foreColor="ffcc0099" default="keyword" />
24   - <fontcolor name="vec-start" foreColor="ff000066" default="keyword" />
25   - <fontcolor name="vec-end" foreColor="ff000066" default="keyword" />
26   - <fontcolor name="map-start" foreColor="ff990066" default="keyword" />
27   - <fontcolor name="map-end" foreColor="ff990066" default="keyword" />
28   - <fontcolor name="function" foreColor="ff1100dd" default="keyword" />
29   - <fontcolor name="macro" foreColor="ff1100dd" default="keyword" />
30   - <fontcolor name="ns-publics" foreColor="ff110000" default="keyword" />
31   - <fontcolor name="ns-interns" foreColor="ff1100dd" default="keyword" />
32   - <fontcolor name="ns-imports" foreColor="ff1100ff" default="keyword" />
33   - <fontcolor name="compiler-special" foreColor="ff1100dd" default="keyword" />
  5 + <fontcolor default="default" name="deref"/>
  6 + <fontcolor default="default" foreColor="ff000080" name="ns-imports">
  7 + <font style="bold"/>
  8 + </fontcolor>
  9 + <fontcolor default="default" foreColor="ff000080" name="ns-interns">
  10 + <font style="bold"/>
  11 + </fontcolor>
  12 + <fontcolor default="default" foreColor="ff000080" name="symbol"/>
  13 + <fontcolor default="default" name="error"/>
  14 + <fontcolor default="default" name="list-start"/>
  15 + <fontcolor default="default" foreColor="ff008000" name="char">
  16 + <font style="bold"/>
  17 + </fontcolor>
  18 + <fontcolor default="default" foreColor="ff660e7a" name="keyword">
  19 + <font style="bold+italic"/>
  20 + </fontcolor>
  21 + <fontcolor default="default" foreColor="blue" name="number"/>
  22 + <fontcolor default="default" name="map-end"/>
  23 + <fontcolor default="default" name="vec-end"/>
  24 + <fontcolor default="default" name="map-start"/>
  25 + <fontcolor default="default" name="list-end"/>
  26 + <fontcolor default="default" name="meta"/>
  27 + <fontcolor default="default" foreColor="orange" name="function"/>
  28 + <fontcolor default="default" foreColor="ff000080" name="ns-publics">
  29 + <font style="bold"/>
  30 + </fontcolor>
  31 + <fontcolor default="default" foreColor="ff000080" name="macro">
  32 + <font style="bold"/>
  33 + </fontcolor>
  34 + <fontcolor default="default" name="unquote"/>
  35 + <fontcolor default="default" name="quote"/>
  36 + <fontcolor default="default" name="vec-start"/>
  37 + <fontcolor default="default" foreColor="ff008000" name="string">
  38 + <font style="bold"/>
  39 + </fontcolor>
  40 + <fontcolor default="default" name="any"/>
  41 + <fontcolor default="default" foreColor="ff000080" name="compiler-special">
  42 + <font style="bold"/>
  43 + </fontcolor>
  44 + <fontcolor default="default" foreColor="lightGray" name="comment">
  45 + <font style="italic"/>
  46 + </fontcolor>
34 47 </fontscolors>
6 netbeans/plugins/org-enclojure-plugin/src/main/java/org/enclojure/ide/nb/editor/layer.xml
@@ -21,6 +21,7 @@
21 21 <folder name="Editors">
22 22 <folder name="text">
23 23 <folder name="x-clojure">
  24 + <attr name="SystemFileSystem.localizingBundle" stringvalue="org.enclojure.ide.nb.editor.Bundle"/>
24 25 <folder name="Toolbars">
25 26 <folder name="Default">
26 27 <file name="Separator-before-comment.instance">
@@ -207,6 +208,11 @@
207 208 </folder>
208 209
209 210 <folder name="OptionsDialog">
  211 + <folder name="PreviewExamples">
  212 + <folder name="text">
  213 + <file name="x-clojure" url="resources/SampleClojureFile.clj"/>
  214 + </folder>
  215 + </folder>
210 216 <file name="org-enclojure-ide-preferences-EnclojureOptionsCategory.instance">
211 217 <attr name="position" intvalue="690"/>
212 218 </file>
11 ...s/plugins/org-enclojure-plugin/src/main/java/org/enclojure/ide/nb/editor/resources/SampleClojureFile.clj
... ... @@ -0,0 +1,11 @@
  1 +; Sample Clojure File
  2 +
  3 +(ns clojure.sample
  4 + (:use clojure.core))
  5 +
  6 +(def my-list '(1 2 3 a b c))
  7 +
  8 +(defn sample-method [x]
  9 + (println x my-list))
  10 +
  11 +(sample-method {:message "Hello World"})
2  org-enclojure-ide/src/main/clojure/org/enclojure/ide/ClojureLexer.clj
@@ -75,7 +75,7 @@
75 75 ])
76 76
77 77 (def token-ids
78   - (into {} (map #(vector %1 (make-tokenid %1 %2 "keyword"))
  78 + (into {} (map #(vector %1 (make-tokenid %1 %2 (name %1)))
79 79 token-names
80 80 (range (count token-names)))))
81 81

0 comments on commit 9fe50c4

Please sign in to comment.
Something went wrong with that request. Please try again.