Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Ticket #47 #9

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Ticket #47 #9

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions netbeans/plugins/org-enclojure-plugin/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -683,6 +683,7 @@
<include>Bundle.properties</include>
<include>**/*.png</include>
<include>**/*.gif</include>
<include>**/*.clj</include>
</includes>
<targetPath>org/enclojure/ide/nb/editor/resources</targetPath>
</resource>
Expand Down
27 changes: 26 additions & 1 deletion .../plugins/org-enclojure-plugin/src/main/java/org/enclojure/ide/nb/editor/Bundle.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,4 +40,29 @@ CTL_AttachDebugProjectWithReplAction=Attach Debugger to Project REPL
CTL_DetachDebugProjectWithReplAction=Detach Debugger from Project REPL
CTL_LoadAllSourcesAction=REPL->Load-all Clojure Files in "%s"
LBL_Maven_Quickstart_Archetype="Clojure quick start archetype"
HINT_MavenQuickStart="clojure-quickstart"
HINT_MavenQuickStart="clojure-quickstart"
text/x-clojure=Clojure
char=Character
symbol=Symbol
map-start=Map Start
any=Any
map-end=Map End
vec-end=Vector End
list-start=List Start
keyword=Keyword
deref=Deref
list-end=List End
meta=Metadata
string=String
vec-start=Vector Start
number=Number
unquote=Unquote
comment=Comment
quote=Quote
function=Function
macro=Macro
ns-publics=Namespace Publics
ns-interns=Namespace Interns
ns-imports=Namespace Imports
compiler-special=Compiler Special
error=Error
71 changes: 42 additions & 29 deletions ...ins/org-enclojure-plugin/src/main/java/org/enclojure/ide/nb/editor/ClojureFontsColors.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,34 +1,47 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE fontscolors PUBLIC "-//NetBeans//DTD Editor Fonts and Colors settings 1.1//EN" "http://www.netbeans.org/dtds/EditorFontsColors-1_1.dtd">

<!--
.comment { color: gray; }
.string { color: teal; }
.function { color: #00c; }
.macro, .specialops { color: #60c; }
.parens { color: #000; }
.keyword { color: #c09; }
.brackets { color: #006; }
.curlybrackets { color: #906; }
-->

<fontscolors>
<!--<fontcolor name="comment" foreColor="ff000000" default="default" />-->
<fontcolor name="any" foreColor="ff000000" default="default" />
<fontcolor name="char" foreColor="ff006600" default="default" />
<fontcolor name="symbol" foreColor="ff000000" default="default" />
<fontcolor name="string" foreColor="ff008080" default="keyword" />
<fontcolor name="list-start" foreColor="ff000000" default="keyword" />
<fontcolor name="list-end" foreColor="ff000000" default="keyword" />
<fontcolor name="keyword" foreColor="ffcc0099" default="keyword" />
<fontcolor name="vec-start" foreColor="ff000066" default="keyword" />
<fontcolor name="vec-end" foreColor="ff000066" default="keyword" />
<fontcolor name="map-start" foreColor="ff990066" default="keyword" />
<fontcolor name="map-end" foreColor="ff990066" default="keyword" />
<fontcolor name="function" foreColor="ff1100dd" default="keyword" />
<fontcolor name="macro" foreColor="ff1100dd" default="keyword" />
<fontcolor name="ns-publics" foreColor="ff110000" default="keyword" />
<fontcolor name="ns-interns" foreColor="ff1100dd" default="keyword" />
<fontcolor name="ns-imports" foreColor="ff1100ff" default="keyword" />
<fontcolor name="compiler-special" foreColor="ff1100dd" default="keyword" />
<fontcolor default="default" name="deref"/>
<fontcolor default="default" foreColor="ff000080" name="ns-imports">
<font style="bold"/>
</fontcolor>
<fontcolor default="default" foreColor="ff000080" name="ns-interns">
<font style="bold"/>
</fontcolor>
<fontcolor default="default" foreColor="ff000080" name="symbol"/>
<fontcolor default="default" name="error"/>
<fontcolor default="default" name="list-start"/>
<fontcolor default="default" foreColor="ff008000" name="char">
<font style="bold"/>
</fontcolor>
<fontcolor default="default" foreColor="ff660e7a" name="keyword">
<font style="bold+italic"/>
</fontcolor>
<fontcolor default="default" foreColor="blue" name="number"/>
<fontcolor default="default" name="map-end"/>
<fontcolor default="default" name="vec-end"/>
<fontcolor default="default" name="map-start"/>
<fontcolor default="default" name="list-end"/>
<fontcolor default="default" name="meta"/>
<fontcolor default="default" foreColor="orange" name="function"/>
<fontcolor default="default" foreColor="ff000080" name="ns-publics">
<font style="bold"/>
</fontcolor>
<fontcolor default="default" foreColor="ff000080" name="macro">
<font style="bold"/>
</fontcolor>
<fontcolor default="default" name="unquote"/>
<fontcolor default="default" name="quote"/>
<fontcolor default="default" name="vec-start"/>
<fontcolor default="default" foreColor="ff008000" name="string">
<font style="bold"/>
</fontcolor>
<fontcolor default="default" name="any"/>
<fontcolor default="default" foreColor="ff000080" name="compiler-special">
<font style="bold"/>
</fontcolor>
<fontcolor default="default" foreColor="lightGray" name="comment">
<font style="italic"/>
</fontcolor>
</fontscolors>
6 changes: 6 additions & 0 deletions netbeans/plugins/org-enclojure-plugin/src/main/java/org/enclojure/ide/nb/editor/layer.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@
<folder name="Editors">
<folder name="text">
<folder name="x-clojure">
<attr name="SystemFileSystem.localizingBundle" stringvalue="org.enclojure.ide.nb.editor.Bundle"/>
<folder name="Toolbars">
<folder name="Default">
<file name="Separator-before-comment.instance">
Expand Down Expand Up @@ -207,6 +208,11 @@
</folder>

<folder name="OptionsDialog">
<folder name="PreviewExamples">
<folder name="text">
<file name="x-clojure" url="resources/SampleClojureFile.clj"/>
</folder>
</folder>
<file name="org-enclojure-ide-preferences-EnclojureOptionsCategory.instance">
<attr name="position" intvalue="690"/>
</file>
Expand Down
11 changes: 11 additions & 0 deletions ...nclojure-plugin/src/main/java/org/enclojure/ide/nb/editor/resources/SampleClojureFile.clj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
; Sample Clojure File

(ns clojure.sample
(:use clojure.core))

(def my-list '(1 2 3 a b c))

(defn sample-method [x]
(println x my-list))

(sample-method {:message "Hello World"})
2 changes: 1 addition & 1 deletion org-enclojure-ide/src/main/clojure/org/enclojure/ide/ClojureLexer.clj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@
])

(def token-ids
(into {} (map #(vector %1 (make-tokenid %1 %2 "keyword"))
(into {} (map #(vector %1 (make-tokenid %1 %2 (name %1)))
token-names
(range (count token-names)))))

Expand Down