Clojure.textmate @@ -4,8 +4,17 @@ <dict> <key>name</key> <string>Miscellaneous</string> + <key>scope</key> + <string>source.clojure</string> <key>settings</key> <dict> + <key>decreaseIndentPattern</key> + <string>(?x)^ [ \t]*+ + (?<par> + ( [^()\n]++ | $ \g<par> $ )*+ + ) + ( \) [ \t]*+ ) ++ + $</string> <key>highlightPairs</key> <array> <array> @@ -22,24 +31,37 @@ </array> </array> <key>increaseIndentPattern</key> - <string>^.*$.*[^)"]$</string> + <string>(?x)^ [ \t]*+ \( + (?<par> + ( [^()\n]++ | \( \g<par> $? )*+ + ) + $</string> + <key>shellVariables</key> + <array> + <dict> + <key>name</key> + <string>TM_COMMENT_START</string> + <key>value</key> + <string>;</string> + </dict> + </array> <key>smartTypingPairs</key> <array> <array> - <string>(</string> - <string>)</string> + <string>"</string> + <string>"</string> </array> <array> - <string>[</string> - <string>]</string> + <string>(</string> + <string>)</string> </array> <array> <string>{</string> <string>}</string> </array> <array> - <string>"</string> - <string>"</string> + <string>[</string> + <string>]</string> </array> </array> </dict> Preferences/Miscellaneous.tmPreferences @@ -19,36 +19,161 @@ <key>patterns</key> <array> <dict> + <key>include</key> + <string>#comment</string> + </dict> + <dict> + <key>include</key> + <string>#qouted-sexp</string> + </dict> + <dict> + <key>include</key> + <string>#sexp</string> + </dict> + <dict> + <key>include</key> + <string>#string</string> + </dict> + <dict> + <key>include</key> + <string>#vector</string> + </dict> + <dict> + <key>include</key> + <string>#set</string> + </dict> + <dict> + <key>include</key> + <string>#map</string> + </dict> + <dict> + <key>include</key> + <string>#regexp</string> + </dict> + <dict> + <key>include</key> + <string>#constants</string> + </dict> + </array> + <key>repository</key> + <dict> + <key>comment</key> + <dict> <key>captures</key> <dict> - <key>2</key> - <dict> - <key>name</key> - <string>storage.type.function-type.lisp</string> - </dict> - <key>4</key> + <key>1</key> <dict> <key>name</key> - <string>entity.name.function.lisp</string> + <string>punctuation.definition.comment.clojure</string> </dict> </dict> <key>match</key> - <string>(\b(?i:(defn))\b)(\s+)((\w|\-|\!|\?)*)</string> + <string>(;).*$\n?</string> <key>name</key> - <string>meta.function.lisp</string> + <string>comment.line.semicolon.clojure</string> </dict> + <key>constants</key> <dict> - <key>match</key> - <string>\b(?i:case|do|let|def|recur|loop|if|else|when-not|when)\b</string> + <key>patterns</key> + <array> + <dict> + <key>match</key> + <string>(nil)</string> + <key>name</key> + <string>constant.language.nil.clojure</string> + </dict> + <dict> + <key>match</key> + <string>(true|false)</string> + <key>name</key> + <string>constant.language.boolean.clojure</string> + </dict> + <dict> + <key>match</key> + <string>(\d+/\d+)</string> + <key>name</key> + <string>constant.numeric.ratio.clojure</string> + </dict> + <dict> + <key>match</key> + <string>(\d+r\d+)</string> + <key>name</key> + <string>constant.numeric.arbitrary-radix.clojure</string> + </dict> + <dict> + <key>match</key> + <string>(0x\d+)</string> + <key>name</key> + <string>constant.numeric.hexidecimal.clojure</string> + </dict> + <dict> + <key>match</key> + <string>(0\d+)</string> + <key>name</key> + <string>constant.numeric.octal.clojure</string> + </dict> + <dict> + <key>match</key> + <string>(\d+)</string> + <key>name</key> + <string>constant.numeric.decimal.clojure</string> + </dict> + </array> + </dict> + <key>map</key> + <dict> + <key>begin</key> + <string>(\{)</string> + <key>end</key> + <string>(\})</string> <key>name</key> - <string>keyword.control.lisp</string> + <string>meta.map.clojure</string> + <key>patterns</key> + <array> + <dict> + <key>include</key> + <string>$self</string> + </dict> + </array> </dict> + <key>qouted-sexp</key> <dict> - <key>match</key> - <string>\b(?i:load-file|require|use|import|ns|gen-and-load-interface)\b</string> + <key>begin</key> + <string>(['``]$)</string> + <key>beginCaptures</key> + <dict> + <key>1</key> + <dict> + <key>name</key> + <string>punctuation.section.expression.begin.clojure</string> + </dict> + </dict> + <key>end</key> + <string>($)(\n)?</string> + <key>endCaptures</key> + <dict> + <key>1</key> + <dict> + <key>name</key> + <string>punctuation.section.expression.end.clojure</string> + </dict> + <key>2</key> + <dict> + <key>name</key> + <string>meta.after-expression.clojure</string> + </dict> + </dict> <key>name</key> - <string>support.function.lisp</string> + <string>meta.qouted-expression.clojure</string> + <key>patterns</key> + <array> + <dict> + <key>include</key> + <string>$self</string> + </dict> + </array> </dict> + <key>regexp</key> <dict> <key>begin</key> <string>#\"</string> @@ -64,13 +189,6 @@ </dict> </array> </dict> - <dict> - <key>include</key> - <string>source.lisp</string> - </dict> - </array> - <key>repository</key> - <dict> <key>regexp_escaped_char</key> <dict> <key>match</key> @@ -78,10 +196,197 @@ <key>name</key> <string>string.regexp.clojure</string> </dict> + <key>set</key> + <dict> + <key>begin</key> + <string>(\#\{)</string> + <key>end</key> + <string>(\})</string> + <key>name</key> + <string>meta.set.clojure</string> + <key>patterns</key> + <array> + <dict> + <key>include</key> + <string>$self</string> + </dict> + </array> + </dict> + <key>sexp</key> + <dict> + <key>begin</key> + <string>($)</string> + <key>beginCaptures</key> + <dict> + <key>1</key> + <dict> + <key>name</key> + <string>punctuation.section.expression.begin.clojure</string> + </dict> + </dict> + <key>end</key> + <string>($)(\n)?</string> + <key>endCaptures</key> + <dict> + <key>1</key> + <dict> + <key>name</key> + <string>punctuation.section.expression.end.clojure</string> + </dict> + <key>2</key> + <dict> + <key>name</key> + <string>meta.after-expression.clojure</string> + </dict> + </dict> + <key>name</key> + <string>meta.expression.clojure</string> + <key>patterns</key> + <array> + <dict> + <key>begin</key> + <string>(?<=$)(def|def-)\s+(.+?)(?=\s)</string> + <key>beginCaptures</key> + <dict> + <key>1</key> + <dict> + <key>name</key> + <string>keyword.control.clojure</string> + </dict> + <key>2</key> + <dict> + <key>name</key> + <string>entity.global.clojure</string> + </dict> + </dict> + <key>end</key> + <string>(?=$)</string> + <key>name</key> + <string>meta.definition.global.clojure</string> + <key>patterns</key> + <array> + <dict> + <key>include</key> + <string>$self</string> + </dict> + </array> + </dict> + <dict> + <key>begin</key> + <string>(?<=$)(defn|defn-)\s+(.+?)(?=\s)</string> + <key>beginCaptures</key> + <dict> + <key>1</key> + <dict> + <key>name</key> + <string>keyword.control.clojure</string> + </dict> + <key>2</key> + <dict> + <key>name</key> + <string>entity.function.clojure</string> + </dict> + </dict> + <key>end</key> + <string>(?=$)</string> + <key>name</key> + <string>meta.definition.function.clojure</string> + <key>patterns</key> + <array> + <dict> + <key>include</key> + <string>$self</string> + </dict> + </array> + </dict> + <dict> + <key>begin</key> + <string>(?<=$)(defmacro|defmacro-)\s+(.+?)(?=\s)</string> + <key>beginCaptures</key> + <dict> + <key>1</key> + <dict> + <key>name</key> + <string>keyword.control.clojure</string> + </dict> + <key>2</key> + <dict> + <key>name</key> + <string>entity.macro.clojure</string> + </dict> + </dict> + <key>end</key> + <string>(?=$)</string> + <key>name</key> + <string>meta.definition.macro.clojure</string> + <key>patterns</key> + <array> + <dict> + <key>include</key> + <string>$self</string> + </dict> + </array> + </dict> + <dict> + <key>include</key> + <string>$self</string> + </dict> + </array> + </dict> + <key>string</key> + <dict> + <key>begin</key> + <string>(")</string> + <key>beginCaptures</key> + <dict> + <key>1</key> + <dict> + <key>name</key> + <string>punctuation.definition.string.begin.clojure</string> + </dict> + </dict> + <key>end</key> + <string>(")</string> + <key>endCaptures</key> + <dict> + <key>1</key> + <dict> + <key>name</key> + <string>punctuation.definition.string.end.clojure</string> + </dict> + </dict> + <key>name</key> + <string>string.quoted.double.clojure</string> + <key>patterns</key> + <array> + <dict> + <key>match</key> + <string>\\.</string> + <key>name</key> + <string>constant.character.escape.clojure</string> + </dict> + </array> + </dict> + <key>vector</key> + <dict> + <key>begin</key> + <string>(\[)</string> + <key>end</key> + <string>(\])</string> + <key>name</key> + <string>meta.vector.clojure</string> + <key>patterns</key> + <array> + <dict> + <key>include</key> + <string>$self</string> + </dict> + </array> + </dict> </dict> <key>scopeName</key> <string>source.clojure</string> <key>uuid</key> - <string>38E7ED10-6743-40EE-A86C-B645C4DAA894</string> + <string>6A87759F-F746-4E84-B788-965B46363202</string> </dict> </plist> Syntaxes/Clojure.tmLanguage @@ -7,7 +7,6 @@ <key>ordering</key> <array> <string>38E7ED10-6743-40EE-A86C-B645C4DAA894</string> - <string>F8598609-EE4F-4EB3-AC79-80FB198EF2CA</string> <string>4317DEFD-FB99-44EB-956C-6EA72E5314D7</string> <string>7B019B03-16B7-4FED-89A9-FBBB4488DFB6</string> <string>B22B0223-9874-4EBE-807C-F99D559D108D</string> info.plist Preferences/Comments.tmPreferences 02db0684522dcacd44a8e030d272ff4630e7259f Scott Fleckenstein nullstyle@gmail.com http://github.com/nullstyle/clojure-tmbundle/commit/eb9676878b0c54378cad000f402ddb62853debba eb9676878b0c54378cad000f402ddb62853debba

2008-11-16T16:51:25-08:00

rework language grammar, using Scheme bundle as a reference ce1ad47e15c7d09a3503a0a2cad654d020bd89eb Scott Fleckenstein nullstyle@gmail.com