kennethreitz-archive/kJS.tmbundle
1
0
Fork 0
mirror of https://github.com/kennethreitz-archive/kJS.tmbundle.git synced 2026-06-05 23:50:19 +00:00
Code Issues Packages Projects Releases Wiki Activity
55 Commits 2 Branches 0 Tags
d60113b0ba99ef6a12d9e18b979f36af2378bb6b
Commit Graph

45 Commits

Author SHA1 Message Date
msheets d60113b0ba • Added puctuation scopes. 
• Change meta.delimiter.statement to punctuation.terminator.statement
• Better scope strings in meta.function.json
• Optimize a few of the larger regex matches.


git-svn-id: http://macromates.com/svn/Bundles/trunk/Bundles/JavaScript.tmbundle@5373 dfb7d73b-c2ec-0310-8fea-fb051d288c6d
 2006-10-05 02:56:50 +00:00
haraldmartin 9fff45d36d • Moved a lot of the generic JS stuff from the Prototype bundle to the JS bundle and removed duplicated rules. 
• Improved some rules to catch more functions (like Object.myfunc = ...)

Some of the rules can be simplified but I'm not a regexp guru so if somebody want to make them shorter/easier/faster, go ahead :)

git-svn-id: http://macromates.com/svn/Bundles/trunk/Bundles/JavaScript.tmbundle@5307 dfb7d73b-c2ec-0310-8fea-fb051d288c6d
 2006-09-26 14:07:21 +00:00
duff 4a0e3a094f • forgot octal numbers (in strings) with the first digit higher than 3 (e.g. \57 or \7) 
git-svn-id: http://macromates.com/svn/Bundles/trunk/Bundles/JavaScript.tmbundle@5203 dfb7d73b-c2ec-0310-8fea-fb051d288c6d
 2006-09-13 18:35:54 +00:00
duff b766a2309c • markup hex (\xHH) and octal (\377) sequences in strings 
git-svn-id: http://macromates.com/svn/Bundles/trunk/Bundles/JavaScript.tmbundle@5202 dfb7d73b-c2ec-0310-8fea-fb051d288c6d
 2006-09-13 18:33:01 +00:00
duff 269f63f493 • allow whitespace before colon when declaring functions as ‘foo: function () { … }’ 
git-svn-id: http://macromates.com/svn/Bundles/trunk/Bundles/JavaScript.tmbundle@4874 dfb7d73b-c2ec-0310-8fea-fb051d288c6d
 2006-08-21 12:10:57 +00:00
msheets d526582b54 Move this & super to a new variable.language rule, though oddly best I can tell super doesn't exist in javascript outside some kind of extension? 
git-svn-id: http://macromates.com/svn/Bundles/trunk/Bundles/JavaScript.tmbundle@4734 dfb7d73b-c2ec-0310-8fea-fb051d288c6d
 2006-08-14 08:14:15 +00:00
msheets ffed18bc0c Remove swallow use in favor of a constant.character.escape pattern. 
git-svn-id: http://macromates.com/svn/Bundles/trunk/Bundles/JavaScript.tmbundle@4645 dfb7d73b-c2ec-0310-8fea-fb051d288c6d
 2006-08-10 05:04:18 +00:00
subtlegradient 3f366bbbbb Added a better indent pref. Added some handy snippets. Added some handy scopes to the language 
git-svn-id: http://macromates.com/svn/Bundles/trunk/Bundles/JavaScript.tmbundle@4352 dfb7d73b-c2ec-0310-8fea-fb051d288c6d
 2006-07-17 07:55:50 +00:00
duff 4cee5c6650 • remove swallow pattern for block comments (I believe this was a cut’n’paste mistake, as escape characters should have no special meaning in JavaScript comments AFAIK) 
git-svn-id: http://macromates.com/svn/Bundles/trunk/Bundles/JavaScript.tmbundle@3979 dfb7d73b-c2ec-0310-8fea-fb051d288c6d
 2006-07-03 06:22:39 +00:00
duff b199a53986 • add matching of functions declared as ‘foobar: function() { … }’ (from Aparajita Fishman) 
git-svn-id: http://macromates.com/svn/Bundles/trunk/Bundles/JavaScript.tmbundle@3432 dfb7d73b-c2ec-0310-8fea-fb051d288c6d
 2006-05-27 06:17:24 +00:00
duff 4bab9c7fec • add : as a valid character in front of regexps 
git-svn-id: http://macromates.com/svn/Bundles/trunk/Bundles/JavaScript.tmbundle@3217 dfb7d73b-c2ec-0310-8fea-fb051d288c6d
 2006-05-03 09:21:09 +00:00
duff 95f6193080 • all single line comments, bullet points (plain text), and quoted lines (mail) now optionally match the newline character — this is so that when the caret is at the end of the line, the scope is still that of “the line.” This is so key equivalents bound to a given scope (like the ‘enter’ key) also work when typing at the end of the line, which would be expected. 
git-svn-id: http://macromates.com/svn/Bundles/trunk/Bundles/JavaScript.tmbundle@2977 dfb7d73b-c2ec-0310-8fea-fb051d288c6d
 2006-04-09 21:31:30 +00:00
cskiadas 3e88431c47 Finished updating dom-1 dictionary. 
git-svn-id: http://macromates.com/svn/Bundles/trunk/Bundles/JavaScript.tmbundle@2461 dfb7d73b-c2ec-0310-8fea-fb051d288c6d
 2005-12-15 04:42:54 +00:00
cskiadas 44039bf8f6 Simplified regexp for support.constant.js to do look-behind for the dot in front. Helps with the highlight if there is a function and a constant with the same name ( eg prompt, link). 
git-svn-id: http://macromates.com/svn/Bundles/trunk/Bundles/JavaScript.tmbundle@2448 dfb7d73b-c2ec-0310-8fea-fb051d288c6d
 2005-12-14 12:56:42 +00:00
cskiadas 077f0e465c More updating of dom dictionary. 
git-svn-id: http://macromates.com/svn/Bundles/trunk/Bundles/JavaScript.tmbundle@2447 dfb7d73b-c2ec-0310-8fea-fb051d288c6d
 2005-12-14 06:36:11 +00:00
kevin edda9e4917 Commit patch by h0h from #textmate 
support.function.event-handler.js names are all lowercased, as required by XHTML
Regexps are now matched more liberally

git-svn-id: http://macromates.com/svn/Bundles/trunk/Bundles/JavaScript.tmbundle@2446 dfb7d73b-c2ec-0310-8fea-fb051d288c6d
 2005-12-14 00:36:31 +00:00
cskiadas 6bfebbed4c Updating the list of dom methods, attributes and constants supported. Work in progress 
git-svn-id: http://macromates.com/svn/Bundles/trunk/Bundles/JavaScript.tmbundle@2438 dfb7d73b-c2ec-0310-8fea-fb051d288c6d
 2005-12-13 16:52:15 +00:00
kevin a120f904cb Add $ as a possible character to start a function name with 
I don't know what is actually legal, google tells me word and underscore, but $ is obviously legal as I have code here that has methods starting with it.

git-svn-id: http://macromates.com/svn/Bundles/trunk/Bundles/JavaScript.tmbundle@2173 dfb7d73b-c2ec-0310-8fea-fb051d288c6d
 2005-11-17 19:16:58 +00:00
duff aad1c3e5ed • add rule to markup «something» = function (…) as functions (from Tony Arnold) 
git-svn-id: http://macromates.com/svn/Bundles/trunk/Bundles/JavaScript.tmbundle@2172 dfb7d73b-c2ec-0310-8fea-fb051d288c6d
 2005-11-17 14:34:20 +00:00
duff 3afecd1a35 • do not markup leading spaces as entity.name.function 
git-svn-id: http://macromates.com/svn/Bundles/trunk/Bundles/JavaScript.tmbundle@2137 dfb7d73b-c2ec-0310-8fea-fb051d288c6d
 2005-11-13 14:13:20 +00:00
duff 7644a06f2f • fix regexp rule to not match the // part of comments 
git-svn-id: http://macromates.com/svn/Bundles/trunk/Bundles/JavaScript.tmbundle@2033 dfb7d73b-c2ec-0310-8fea-fb051d288c6d
 2005-10-28 18:07:42 +00:00
duff 8cc766b829 • updated JavaScript regexp to use look-behind assertion and match escapes inside regexp 
git-svn-id: http://macromates.com/svn/Bundles/trunk/Bundles/JavaScript.tmbundle@2017 dfb7d73b-c2ec-0310-8fea-fb051d288c6d
 2005-10-26 15:23:36 +00:00
duff 55bc1657aa • use pattern for JavaScript functions from Gavin Kistner 
git-svn-id: http://macromates.com/svn/Bundles/trunk/Bundles/JavaScript.tmbundle@1915 dfb7d73b-c2ec-0310-8fea-fb051d288c6d
 2005-10-09 14:26:32 +00:00
duff 2bb829e081 • new folding marker patterns (from Caio Chassot) 
git-svn-id: http://macromates.com/svn/Bundles/trunk/Bundles/JavaScript.tmbundle@1886 dfb7d73b-c2ec-0310-8fea-fb051d288c6d
 2005-10-06 08:34:44 +00:00
duff 61e19ee658 • fixed function pattern (both in folding and meta.function) 
git-svn-id: http://macromates.com/svn/Bundles/trunk/Bundles/JavaScript.tmbundle@1786 dfb7d73b-c2ec-0310-8fea-fb051d288c6d
 2005-09-13 13:12:17 +00:00
duff 22fd97014e • changed * to + in regexp match to avoid zero-width matches 
git-svn-id: http://macromates.com/svn/Bundles/trunk/Bundles/JavaScript.tmbundle@1407 dfb7d73b-c2ec-0310-8fea-fb051d288c6d
 2005-08-02 17:22:02 +00:00
mats 0d5f8bbcf6 -- changed "declaration.*" to "meta.*" 
-- corrected some syntax highlighting bugs around the place


git-svn-id: http://macromates.com/svn/Bundles/trunk/Bundles/JavaScript.tmbundle@1369 dfb7d73b-c2ec-0310-8fea-fb051d288c6d
 2005-07-23 16:22:50 +00:00
kevin ca95a4796d Add opt-ctrl-shift-J shortcut for JavaScript 
git-svn-id: http://macromates.com/svn/Bundles/trunk/Bundles/JavaScript.tmbundle@1275 dfb7d73b-c2ec-0310-8fea-fb051d288c6d
 2005-07-01 02:03:11 +00:00
duff 73e2f67615 More languages updated to new naming scheme. 
git-svn-id: http://macromates.com/svn/Bundles/trunk/Bundles/JavaScript.tmbundle@1177 dfb7d73b-c2ec-0310-8fea-fb051d288c6d
 2005-06-11 15:25:41 +00:00
mats a14cbab724 -- corrected an error in "keyword.operator.js" where a ) was included. 
git-svn-id: http://macromates.com/svn/Bundles/trunk/Bundles/JavaScript.tmbundle@1147 dfb7d73b-c2ec-0310-8fea-fb051d288c6d
 2005-06-03 13:50:37 +00:00
duff b67473bf1e • Removed start parenthesis (had no matching end parenthesis and was anyway redundant) 
git-svn-id: http://macromates.com/svn/Bundles/trunk/Bundles/JavaScript.tmbundle@1031 dfb7d73b-c2ec-0310-8fea-fb051d288c6d
 2005-05-21 04:48:41 +00:00
mats 856b3badbd -- minor reworking of "keyword.operator.js" group to work around a HL bug not working on some operators 
git-svn-id: http://macromates.com/svn/Bundles/trunk/Bundles/JavaScript.tmbundle@980 dfb7d73b-c2ec-0310-8fea-fb051d288c6d
 2005-05-19 16:52:40 +00:00
duff 876f09c794 Changed all uses of \< and \> to \b. Beta 9 uses oniguruma as regular expression library and doesn't have the former. Other than that, and lack of conditions (?(n)<true>:<false>) (and different syntax for (?R)) then there shouldn't be any compatibility problems. On the positive side, oniguruma has recursive sub-groups, look-behind, is faster, and gives proper error codes for bad regular expressions! 
git-svn-id: http://macromates.com/svn/Bundles/trunk/Bundles/JavaScript.tmbundle@916 dfb7d73b-c2ec-0310-8fea-fb051d288c6d
 2005-05-15 02:18:40 +00:00
duff e5d5ecca6e Minor changes made to rule names. 
git-svn-id: http://macromates.com/svn/Bundles/trunk/Bundles/JavaScript.tmbundle@835 dfb7d73b-c2ec-0310-8fea-fb051d288c6d
 2005-05-04 01:18:00 +00:00
duff 115c45cf85 Using the new entity.* hierarchy for functions, classes, and tags. 
git-svn-id: http://macromates.com/svn/Bundles/trunk/Bundles/JavaScript.tmbundle@829 dfb7d73b-c2ec-0310-8fea-fb051d288c6d
 2005-05-03 22:36:01 +00:00
mats 8b9c84f956 -- Changed scopeName to "source.js" instead of "source.javascript". Didn't see the need for such a long name. (Might be missing something) 
-- Added some comments and cleaned it slightly.

This file now will replace the soon to be deleted JavaScript (PHP) file.

git-svn-id: http://macromates.com/svn/Bundles/trunk/Bundles/JavaScript.tmbundle@751 dfb7d73b-c2ec-0310-8fea-fb051d288c6d
 2005-04-26 16:00:30 +00:00
kevin 2faba0dbea Switch JavaScript object matching to be case-sensitive 
git-svn-id: http://macromates.com/svn/Bundles/trunk/Bundles/JavaScript.tmbundle@746 dfb7d73b-c2ec-0310-8fea-fb051d288c6d
 2005-04-26 09:59:07 +00:00
kevin 6a3fdd55e6 Update JavaScript syntax to include all of the niceties of the JavaScript (PHP) syntax 
Update the White background settings to color all of the special JavaScript keyword types nicely

git-svn-id: http://macromates.com/svn/Bundles/trunk/Bundles/JavaScript.tmbundle@744 dfb7d73b-c2ec-0310-8fea-fb051d288c6d
 2005-04-26 09:18:33 +00:00
kevin 6854a952c3 Fix JavaScript regex to not override block comments 
git-svn-id: http://macromates.com/svn/Bundles/trunk/Bundles/JavaScript.tmbundle@743 dfb7d73b-c2ec-0310-8fea-fb051d288c6d
 2005-04-26 08:15:27 +00:00
kevin d99e47abb8 Update JavaScript syntax definition for b6 
Fix the regex matching to only match regexes (defined as starting a line or following a "=" or "(" with optional whitespace)

git-svn-id: http://macromates.com/svn/Bundles/trunk/Bundles/JavaScript.tmbundle@742 dfb7d73b-c2ec-0310-8fea-fb051d288c6d
 2005-04-26 08:05:12 +00:00
duff 2b96a7f41b Changed all names to singular form. 
git-svn-id: http://macromates.com/svn/Bundles/trunk/Bundles/JavaScript.tmbundle@649 dfb7d73b-c2ec-0310-8fea-fb051d288c6d
 2005-04-22 08:47:20 +00:00
duff 8e51a1f42f • Added scopeName key to all languages. Most of them as source.<filename>. 
• Added a language for plain text files, currently just markups bullet points (so I can continue these on 'enter' using a scoped snippet).
• Added a new “firstLineMatch” key to Perl, Ruby, and Shell languages.
• The C/Objective-C languages use the scopeName in their include directives, this doesn't work for beta 5.
• Ruby now includes “source.ruby” when using #{ ... } in strings.
• Added capture names to a few languages (objective-c methods, though it's not very consistant, we'll need to discuss how to split up functions and name the various parts).
• Removed plist filetype from XML, assuming that people loading a plist into a text editor would generally use the old-style format.



git-svn-id: http://macromates.com/svn/Bundles/trunk/JavaScript.tmbundle@612 dfb7d73b-c2ec-0310-8fea-fb051d288c6d
 2005-04-21 07:08:56 +00:00
neoneye d7093479d0 I noticed that RegExp.$3 wasn't colored correct. The '3' was colored as it were a number.. in this context its an instance variable. 
I added a rule to recognize instance variables.

git-svn-id: http://macromates.com/svn/Bundles/trunk/JavaScript.tmbundle@526 dfb7d73b-c2ec-0310-8fea-fb051d288c6d
 2005-03-22 11:13:31 +00:00
chris 7155975069 Convert JavaScript to new scheme 
git-svn-id: http://macromates.com/svn/Bundles/trunk/JavaScript.tmbundle@182 dfb7d73b-c2ec-0310-8fea-fb051d288c6d
 2005-02-02 05:53:42 +00:00
duff 79bc5ba34e JavaScript syntax by Caio Chassot. 
git-svn-id: http://macromates.com/svn/Bundles/trunk/JavaScript.tmbundle@166 dfb7d73b-c2ec-0310-8fea-fb051d288c6d
 2005-02-01 02:31:31 +00:00