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
234 Commits 2 Branches 0 Tags
master
Commit Graph

65 Commits

Author SHA1 Message Date
Thomas Aylott ba5fa1d4d8 Updated folding to that of Embedded 2009-02-15 08:14:36 +00:00
Thomas Aylott b239febbfd Removed the conditional-compilation since I moved it into the other syntax 2009-02-15 08:14:32 +00:00
subtlegradient 5692efe8c1 Removed redundant group scope 
git-svn-id: http://macromates.com/svn/Bundles/trunk/Review/Bundles/JavaScript.tmbundle@10113 dfb7d73b-c2ec-0310-8fea-fb051d288c6d
 2008-07-02 17:01:52 +00:00
subtlegradient b84367b126 Fixed regression with nested groups and functions 
git-svn-id: http://macromates.com/svn/Bundles/trunk/Review/Bundles/JavaScript.tmbundle@9131 dfb7d73b-c2ec-0310-8fea-fb051d288c6d
 2008-03-16 06:35:43 +00:00
subtlegradient bb8deef61d Tweaking regex for optimization and performance. disabling "punctuation.section.scope.round" seems to have helped. 
git-svn-id: http://macromates.com/svn/Bundles/trunk/Review/Bundles/JavaScript.tmbundle@9130 dfb7d73b-c2ec-0310-8fea-fb051d288c6d
 2008-03-16 06:16:45 +00:00
subtlegradient d72e54c64d Fixed the parsing of object values that are regular expression literal. Thanks Daniel Stockman 
git-svn-id: http://macromates.com/svn/Bundles/trunk/Review/Bundles/JavaScript.tmbundle@9126 dfb7d73b-c2ec-0310-8fea-fb051d288c6d
 2008-03-16 02:38:15 +00:00
subtlegradient f6ff90bedc Split out object-properties into the repository to keep things clean 
git-svn-id: http://macromates.com/svn/Bundles/trunk/Review/Bundles/JavaScript.tmbundle@8632 dfb7d73b-c2ec-0310-8fea-fb051d288c6d
 2007-12-09 08:19:12 +00:00
subtlegradient 581d5ad997 Changes scopes. source.js => source.js.base, source.js.basic => source.js 
Include source.js.basic if you want embedded javascript in your language.
Include source.js.base if you want to extend javascript, EG: MooTools

git-svn-id: http://macromates.com/svn/Bundles/trunk/Review/Bundles/JavaScript.tmbundle@8614 dfb7d73b-c2ec-0310-8fea-fb051d288c6d
 2007-12-05 21:22:56 +00:00
subtlegradient 5335a0d676 Copying JavaScript to review 
git-svn-id: http://macromates.com/svn/Bundles/trunk/Review/Bundles/JavaScript.tmbundle@8600 dfb7d73b-c2ec-0310-8fea-fb051d288c6d
 2007-12-05 18:44:38 +00:00
duff 093215cd0b • match regexps that follow a ‘return’ keyword, example: 
return /^[a-zA-Z]([a-zA-Z0-9+-.])*:/.test(s);



git-svn-id: http://macromates.com/svn/Bundles/trunk/Bundles/JavaScript.tmbundle@7067 dfb7d73b-c2ec-0310-8fea-fb051d288c6d
 2007-04-26 23:15:46 +00:00
duff c9ca65bb80 • add jsx as a recognized file type, apparently what Photoshop CS2 and CS3 uses for JavaScript 
git-svn-id: http://macromates.com/svn/Bundles/trunk/Bundles/JavaScript.tmbundle@7017 dfb7d73b-c2ec-0310-8fea-fb051d288c6d
 2007-04-19 22:02:41 +00:00
duff 29989a44d7 • change several patterns of the form: [A-Za-z…]+\w* into [A-Za-z…][\w…]* — I am thinking though, that ‘…’ should not be allowed for anything but the first character 
• change a pattern of the fork: \w+ \.? \w* into \w+ (\. \w*)?

Both of the above would previously result in potential really bad performance, because two greedy repeats basically matching the same thing, was after each other, and that leads to exponential time complexity in input size.


git-svn-id: http://macromates.com/svn/Bundles/trunk/Bundles/JavaScript.tmbundle@6859 dfb7d73b-c2ec-0310-8fea-fb051d288c6d
 2007-03-20 11:51:44 +00:00
duff d01c07ff38 • handle com.some.namespace.Function = test() { } — ticket 2629590E 
git-svn-id: http://macromates.com/svn/Bundles/trunk/Bundles/JavaScript.tmbundle@6787 dfb7d73b-c2ec-0310-8fea-fb051d288c6d
 2007-03-12 14:44:56 +00:00
subtlegradient 0539e44989 Removed old bas scope 
Set ⌥⇧: as the shortcut for object keys
Set the trigger for "for faster" to "for" to get the menu

git-svn-id: http://macromates.com/svn/Bundles/trunk/Bundles/JavaScript.tmbundle@6595 dfb7d73b-c2ec-0310-8fea-fb051d288c6d
 2007-02-15 04:34:38 +00:00
duff 9ec26daccc • recognize documentation comments (/** … */) — patch from Dave Grijalva 
git-svn-id: http://macromates.com/svn/Bundles/trunk/Bundles/JavaScript.tmbundle@6575 dfb7d73b-c2ec-0310-8fea-fb051d288c6d
 2007-02-13 04:48:32 +00:00
subtlegradient 494487abe6 Fix for javascript "fred = (whatever)" being considered a function 
git-svn-id: http://macromates.com/svn/Bundles/trunk/Bundles/JavaScript.tmbundle@6341 dfb7d73b-c2ec-0310-8fea-fb051d288c6d
 2006-12-12 21:11:31 +00:00
subtlegradient 1d19d9c169 Remove the rule that incorrectly turns anything with a dot before an = into a class. this grammar still needs some serious work imho. 
git-svn-id: http://macromates.com/svn/Bundles/trunk/Bundles/JavaScript.tmbundle@6257 dfb7d73b-c2ec-0310-8fea-fb051d288c6d
 2006-11-28 03:07:25 +00:00
msheets 82f10d6ae3 Include the delimiters in the string.quoted.single scope rather than just the content. 
git-svn-id: http://macromates.com/svn/Bundles/trunk/Bundles/JavaScript.tmbundle@5998 dfb7d73b-c2ec-0310-8fea-fb051d288c6d
 2006-11-07 22:05:57 +00:00
msheets bb4b016f32 • Change entity.name.object.js.firebug to entity.name.type.object.js.firebug 
• Change entity.name.instance to entity.name.type.instance


git-svn-id: http://macromates.com/svn/Bundles/trunk/Bundles/JavaScript.tmbundle@5728 dfb7d73b-c2ec-0310-8fea-fb051d288c6d
 2006-10-29 20:27:04 +00:00
msheets 6fef2d6b80 Add more specific scopes for true|false|null: 
constant.language.boolean.true.js, constant.language.boolean.false.js, constant.language.null.js

From james on the mailing list.


git-svn-id: http://macromates.com/svn/Bundles/trunk/Bundles/JavaScript.tmbundle@5650 dfb7d73b-c2ec-0310-8fea-fb051d288c6d
 2006-10-26 20:39:09 +00:00
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