Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also .

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also .
...
Commits on Jan 31, 2012
@stepheneb stepheneb rake task creates/installs coffeescript.syntax
The ultraviolet gem doesn't work with Ruby 1.9, instead
we need to use the updated 'spox' versions of ultraviolet
and plist:

  spox-ultraviolet, spox-plist

This new rake task: install_coffeescript_syntax loads
either the original gems if running Ruby < 1.9 or the
'spox' versions if running on Ruby >= 1.9.

Load CoffeeScript.tmLanguage directly from the github repo
for the TextMate bundle.

Parse and write the yaml-format syntax file directly
into the correct location in the ultraviolet gem.
deae3e5
Commits on Jun 10, 2012
@gabehollombe gabehollombe Add example of destructuring assignment in class constructors for opt…
…ions
7fdd21b
Commits on Jul 04, 2012
@gabehollombe gabehollombe add documentation for using switch without a control expression 7065538
Commits on Oct 16, 2012
@gabehollombe gabehollombe Updated example using @epidemian's suggestion 334dcbd
Commits on Feb 25, 2013
@epidemian epidemian Improved lexer error messages 25091fb
@epidemian epidemian Improved parser error messages caacd89
@epidemian epidemian Pass 0-based indexes to CompilerError 7e5f1b1
@epidemian epidemian Remove redundant filename in error message 5f00d64
Commits on Feb 26, 2013
@epidemian epidemian Improved compiler error messages f2efada
@epidemian epidemian Add some error formatting tests
Thanks to them i discovered that the parser errors where indicating the wrong token ¬¬
44e3a76
@epidemian epidemian Fix failing parser error message test fbc8417
@epidemian epidemian Optimized `repeat` and its tests 1db89d1
Commits on Feb 27, 2013
@epidemian epidemian Add CompilationError.fromLocationData 5115fcb
Commits on Mar 01, 2013
@epidemian epidemian Make error messages show only first line on multi-line errors 3182475
Commits on Mar 02, 2013
@spinda spinda Patch child_process.fork to run .coffee files c98fae5
@epidemian epidemian Show colorized error messages 55c99df
Commits on Mar 04, 2013
@epidemian epidemian Integrate error messages on the REPL 0affb4f
@epidemian epidemian Integrate error messages on the site editor
 Nothing really fancy here; mostly preserves the old format. Maybe if we had a more full-fledged test editor we could show the errors in-line =D

  Also, i couldn't get the `rake doc` task running properly, so i mostly test this editing the index.html directly (ups!).
3127e76
@epidemian epidemian Remove a couple of TODOs (WONTDOs really) 589d67d
@epidemian epidemian Make duplicate param name errors mark the actual duplicate parameter
Before:

    coffee> foo = (bar, baz, bar, qux) ->
    repl:1:7: error: multiple parameters named 'bar'
    foo = (bar, baz, bar, qux) ->
          ^^^^^^^^^^^^^^^^^^^^^^^

Now:

    coffee> foo = (bar, baz, bar, qux) ->
    repl:1:18: error: multiple parameters named 'bar'
    foo = (bar, baz, bar, qux) ->
                     ^^^

Also works with destructuring parameters and what have you.
9ea4268
@marchaefner marchaefner Fix location of tokens with no length
by actually using the computed offset.
97a41ad
@marchaefner marchaefner Exclude preceding newlines from INDENT tokens.
Produces more meanignful locationData.
ebff9fb
@marchaefner marchaefner Improve locationData of implicit object braces.
Set location of generated left brace to start of content, so the corresponding AST nodes don't span preceding spaces, blank lines or comments.
74181c0
@jwalton jwalton Move sourceMappingURL line to bottom of file 2684737
Commits on Mar 05, 2013
@marchaefner marchaefner Clean up unused parameter. dcd74d3
@jwalton jwalton Add multiline horrible kludge for IE add84bf
@jashkenas Merge pull request #2772 from marchaefner/master
Minor improvements for locationData of tokens and some clean up.
26102a0
@michaelficarra michaelficarra Merge pull request #2770 from benbria/master
Move sourceMappingURL to bottom of generated JavaScript file.
22d6a4b
@spinda spinda Fix #2768: rewrite literate code before the join fca6871
@jashkenas Fixes #2773 -- tricky dependency ordering when overriding bound funct…
…ions.
903e9c9
@jashkenas Merge pull request #2776 from mintplant/fix-2768
Fix #2768: support --join'ing mixed literate and non-literate CoffeeScript source files
51b1aff
@epidemian epidemian Merge branch 'master' of git://github.com/jashkenas/coffee-script int…
…o improved-error-messages

Conflicts:
	Cakefile
	lib/coffee-script/coffee-script.js
	lib/coffee-script/command.js
	lib/coffee-script/nodes.js
	lib/coffee-script/repl.js
	src/coffee-script.coffee
	src/helpers.coffee
	src/nodes.coffee
	src/repl.coffee
b400047
@jashkenas cleaning up the previous merge -- moving it out to helpers.invertLite…
…rate
1b57341
@jashkenas Fixes #2422 -- Catch clause scoping plus old IE f8c6b49
@epidemian epidemian Get rid of CompilationError and instead have a couple of functions on…
… helpers.coffee
5da7f6a
@jashkenas Merge pull request #2417 from gabehollombe/doc_for_switch_with_no_con…
…trol_expression

Documentation for switch statements with no control expression
304432c
@jashkenas Removing debugging source location output from --nodes. It shouldn't …
…have snuck in there.
fbe07f1
@jashkenas Fixes #1055 -- disallow invalid keys in object literals ... but allow…
… them where the implicit object is being used as a class defn' or a destructuring
355754e
@epidemian epidemian Remove column number from online editor error box 342a796
@jashkenas Fixes #1066 -- interpolated strings are not implicit funcs de8ec2b
Commits on Mar 06, 2013
@jwalton jwalton Fix sourceRoot and relative path for .coffee files in generated sourc…
…e maps.
d6e1a97
@jwalton jwalton Better fix for sourceRoot and relative path for .coffee files in sour…
…ce maps.
ce6772f
@jwalton jwalton Code inspect fixes from the inimitable Nami-Doc 185b2ce
@fahad19 fahad19 fix: compiling `coffee.coffee` produces `.js` file. 4d7151a
Commits on Mar 07, 2013
@fahad19 fahad19 more test coverage for `baseFileName` helper. 072df5e
@fahad19 fahad19 tests for `baseFileName` helper for files with only coffee-script ext…
…ensions as the file name.
18fec7e
@jashkenas Merge pull request #2795 from fahad19/master
Fix: compiling `coffee.coffee` produces `.js` file.
4be4ea3
@jashkenas merge 774ee6a
@jashkenas Fixes #2781, fixes #2782. Reverting to old method of instance method …
…binding.
67de35f
@jashkenas Add an additonal test, courtesy @matehat 8b134cf
@jashkenas Fixes #2796, by adding a test for it. 8f7f362
Commits on Mar 08, 2013
@jwalton jwalton Rework API for sourcemap filenames and paths. f85d19b
@jwalton jwalton Remove dead variables. 242f397
@jwalton jwalton Merge remote-tracking branch 'upstream/master'
Conflicts:
	lib/coffee-script/helpers.js
	test/helpers.coffee
c4f50b5
@jashkenas Merge pull request #2803 from benbria/master
Rework source map files and paths
0120db0
Commits on Mar 09, 2013
@jashkenas Fixes #2490 -- adding guard-style if blocks 13fae12
@jashkenas disallow multiple else blocks in if/guard syntax c53df12
@jashkenas #2490 -- implementing a conditional in terms of the guard style. b44435a
@jashkenas #2490. A bit more of the style. c7da623
@jashkenas Reverting #2490 dbb99f3
Commits on Mar 10, 2013
@epidemian epidemian Add check for end of input on parseError handler 09f8df9
@jashkenas Fixes #2808. Remove --require flag. 0d45287
@sonicdoe sonicdoe Fix typo in documentation af0bdae
@michaelficarra michaelficarra Merge pull request #2810 from SonicHedgehog/master
Fix typo in documentation
838e5e1
@epidemian epidemian Merge branch 'master' of git://github.com/jashkenas/coffee-script int…
…o improved-error-messages

Conflicts:
	lib/coffee-script/coffee-script.js
	lib/coffee-script/command.js
	lib/coffee-script/helpers.js
	lib/coffee-script/lexer.js
	lib/coffee-script/nodes.js
	lib/coffee-script/repl.js
	src/coffee-script.coffee
	src/command.coffee
	src/helpers.coffee
	src/lexer.coffee
	src/nodes.coffee
	test/helpers.coffee
f0fcf4a
@jashkenas Merge pull request #2723 from epidemian/improved-error-messages
Improved error messages
97980ff
Commits on Mar 11, 2013
@jashkenas rebuilt source code documentation with new version of Docco. 69f6500
@epidemian epidemian Fixes #1829. Preserve variable scope in the REPL 5a00442
@jashkenas Merge pull request #2814 from epidemian/issue1829
Fixes #1829. Preserve variable scope in the REPL
decc0f1
@epidemian epidemian Add REPL scoping tests 119ec16
Commits on Mar 12, 2013
@hden hden fix node v0.10 path 64301d0
@michaelficarra michaelficarra Merge remote-tracking branch 'epidemian/issue1829' 5ec658c
@michaelficarra michaelficarra @epidemian typo 20d98c7
@epidemian epidemian Keep REPL running on runtime errors 45bcd9f
@hden hden port patchStackTrace from Redux b7f0653
@hden hden accept override 9b6772a
@epidemian epidemian Fixes #1829. Preserve variable scope in the REPL b0cbd90
@epidemian epidemian Add REPL scoping tests 4ca6da4
@michaelficarra michaelficarra @epidemian typo f56f5f2
@jashkenas Merge pull request #2820 from hden/source-maps-in-node
Source maps in node
e1c6b08
@hden hden fix node v0.10 path d3263dc
@hden hden Merge branch 'fix-path' of https://github.com/hden/coffee-script into…
… fix-path
601189e
@hden hden manually add the newline at EOF 2259542
Commits on Mar 13, 2013
@epidemian epidemian Bump engines.node version on package.json to 0.8 9787ce5
@iamwilhelm iamwilhelm added warning that we need node 0.8+ to run repl
remove unnecessary parens and else statement in repl

we do this by convention of the main coffee source

fix: exit should be process.exit

compiled and build full
70e8303
@michaelficarra michaelficarra Merge pull request #2824 from iamwilhelm/master
added warning that repl needs node.js >= 0.8
707655d
@michaelficarra michaelficarra minor cleanup of parent commit 4ac223b
@jashkenas Merge pull request #2826 from epidemian/bump-engines-node
Bump engines.node version on package.json to 0.8
54258e4
@hden hden roll back to options.filename a8b6556
@hden hden build 7d08dbb
@jashkenas Merge pull request #2819 from hden/fix-path
Quick fix for node v0.10 path
71bb610
@jashkenas Merge pull request #2817 from epidemian/keep-repl-running
Keep REPL running on runtime errors
56413ba
Commits on Mar 14, 2013
@hden hden found a linear shift of lineno, dirty patch for now
It seems that js -> coffee line mapping has a linear shifting.
Dirty patch by applying linear correction.
Dumb, but maybe a hint.
052e3cc
@hden hden Apply modifications by @jwalton d4254a4
@marchaefner marchaefner Improve literate mode.
* Expect a blank line as delimiter between text and code (#2821).
* Don't change indentation of code. It is not necessary and leads to
  erroneous locationData. (#2835)
* Don't modify blank lines and reverse the change in the lexer.
* Don't ignore indentation with mixed whitespace.
52ca531
Commits on Mar 15, 2013
@marchaefner marchaefner Test case for literal mode: Code blocks must be preceded by blank line. 44c2b4a
@marchaefner marchaefner Compiled JavaScript files for improved literal mode. b8d695a
@MattKunze MattKunze fix path handling on Windows f217a10
Commits on Mar 17, 2013
@jashkenas Merge pull request #2840 from MattKunze/windows_paths
fix path handling on Windows
4386f2a
@jashkenas Merge pull request #2838 from marchaefner/master
Improve literal mode.
c44826a
@jashkenas Fixes #2555 2f5b11b
@jashkenas Merge pull request #2827 from hden/lineno
Lineno
9d025df
@jashkenas whitespace 0bfe639
@jashkenas Fixes #2478 -- mention js2coffee in docs fd0b1ff
Commits on Mar 18, 2013
@hden hden use btoa as base64 encoder, inspired by @ashtuchkin c24e957
@hden hden fixed lineno 5fb0479
@hden hden safer browser check b2aa179
@hden hden better naming by @michaelficarra 011d7dc
@jashkenas Merge pull request #2847 from hden/browser-source-map
Browser source map
2d6a856
@michaelficarra michaelficarra small stylistic change and optimisation to code from #2847 84c44c0
@michaelficarra michaelficarra be a little more descriptive, as per @epidemian's suggestion 417008a
@jashkenas Fixes #2737, fix fork() for both .js and .coffee, revised. 4f815ea
@jashkenas CoffeeScript 1.6.2 a3e8de3
@jashkenas Fixing erroneous whitespace fix in generated JS 566a7da
@jashkenas Big refactor of SourceMap class. Literate CoffeeScript. Purdy. 6786bab
@jashkenas slimming SourceMap slightly further c8b8beb
@jashkenas better docs for source maps 194baa0
@jashkenas better docs for source maps 4bef435
@jashkenas better docs for source maps 7f0610d
@jashkenas removing sourceColumn reset 78d10f3
@toots toots More explicit window context in src/browser.coffee. 1e99f88
@toots toots Rebuild. 6dd6162
Commits on Mar 19, 2013
@jashkenas Merge pull request #2851 from toots/master
More explicit window context.
57d3cfd
Commits on Mar 20, 2013
@hden hden quick-fix with a different approach e091c9d
@jashkenas Merge pull request #2865 from hden/inline
quick-fix
c159a64
@marchaefner marchaefner Fix Windows path separator issue in `baseFileName`.
Windows accepts forward and backward slashes as path separator.
1b2fe69
Commits on Mar 21, 2013
@michaelficarra michaelficarra Merge pull request #2869 from marchaefner/master
Fix Windows path separator issue in `baseFileName`.
e26f982
@hden hden encode unicode src, test added b2d6997
Commits on Mar 24, 2013
@michaelficarra michaelficarra Merge pull request #2867 from hden/2853
encode unicode src, test added
718224f
Commits on Mar 25, 2013
@danielgtaylor danielgtaylor Add history to the coffee interactive interpreter that persists betwe…
…en sessions using a ~/.coffee_history file in a similar way to bash. Code based on repl.history and Node pull request 3178 with modifications.
9bfafb8
@danielgtaylor danielgtaylor Rebuild to remove debugging log statement 3c0344b
@danielgtaylor danielgtaylor Remove explicit catch that did nothing 1643f7d
@danielgtaylor danielgtaylor Make history file optional and configurable via the opts passed to re…
…pl.start
17a1cdb
@danielgtaylor danielgtaylor Add unit test to read and run a line from the interpreter history fil…
…e and remove the dummy history file after tests have completed.
3251efa
@danielgtaylor danielgtaylor Use separate variable for fd used to read history file; use string in…
…terpolation to print code lines; do not use unit test to remove temporary file and instead use a process exit event handler
a1ff4ae
@vendethiel vendethiel fix #2846 53a5f26
@michaelficarra michaelficarra Merge pull request #2890 from Nami-Doc/issue2846
fix #2846
cc84d6e
Commits on Mar 26, 2013
@danielgtaylor danielgtaylor Use string interpolation for .history command; rename out variable to…
… history an store the history in it as an array in the proper order so that printing it is just a join operation
2d0e45c
@danielgtaylor danielgtaylor Pop off partial line if input history file was truncated; make maximu…
…m input history file size configurable via repl start options
4dbd9dc
Commits on Mar 27, 2013
@jashkenas Merge pull request #2886 from danielgtaylor/repl-history
Add history to the coffee interactive interpreter that persists between ...
8be65de
Commits on Mar 28, 2013
@billymoon billymoon Literate flag
Add `-L` or `--literate` command line flags (lowercase `l` is already taken) to allow literate coffee script to be read in from `stdio`
5d5920c
Commits on Apr 05, 2013
@jiangmiao jiangmiao Fixes #2908, add "\n" between pure literal header and function body. 337ebd3
Commits on Apr 06, 2013
@jashkenas Fix regression with executable class bodies and prototypal attachment. 0cadcdc
@jashkenas Merge branch 'master' of https://github.com/jashkenas/coffee-script 170f311
Commits on Apr 07, 2013
@danielgtaylor danielgtaylor Replace large comprehension with much simpler code; fix comment to re…
…ference maxSize instead of previous 10KB limit; only pop a history entry if the file size is actually bigger than maxSize; only add items to the history if they are different from the last item by storing the last line and loading it on startup.
feaea49
@danielgtaylor danielgtaylor Move lastLine setter into conditional block to prevent .commands and …
…blank lines from setting lastLine
0e2d2ea
Commits on Apr 08, 2013
@jashkenas Merge pull request #2914 from danielgtaylor/repl-history
repl history implementation improvements
740a7bc
Commits on Apr 12, 2013
@marchaefner marchaefner #2900 -- parameter-less catch clause.
Plus some minor cleanup after f8c6b49
cf07fcb
@jashkenas Merge pull request #2924 from marchaefner/master
Parameter-less catch clause.
f21dc7a
@marchaefner marchaefner Fix error reporting for invalid object key. af81f6d
Commits on Apr 15, 2013
@marchaefner marchaefner Fixes #1057: Allow catch/finally in single line functions.
* Don't end single-line functions at `catch` or `finally`.
* Remove unused `IMPLICIT_BLOCK` and superfluous test for `IF`.
69d66a1
@lucasb-eyer lucasb-eyer Keep the js comment on a single line if the herecomment is on a singl…
…e line.
ccc7c44
@michaelficarra michaelficarra Merge pull request #2925 from marchaefner/master
Fix error reporting for invalid object key.
c6398e1
@michaelficarra michaelficarra Merge pull request #2929 from lucasb-eyer/master
Keep a single-line herecomment as a single-line js comment.
c785e00
Commits on Apr 19, 2013
@vendethiel vendethiel Fix missing `` ` `` - #2926 4b4818d
Commits on Apr 20, 2013
@bobbydavid bobbydavid Fix bug in REPL where history file was closed late.
The history file was set to close on process exit, when it
should close on REPL exit. Listening to the process exit
event causes a warning when more than 10 CoffeeScript REPL
instances are opened in the same program, which happens in
the test.
71aea4b
@michaelficarra michaelficarra Merge pull request #2943 from bobbydavid/master
fix warning in REPL tests about memory leak.
e06a17d
@michaelficarra michaelficarra Merge pull request #2940 from jiangmiao/issue2908
Fixes #2908, add "\n" between pure literal header and function body.
3b38153
Commits on Apr 21, 2013
@vendethiel vendethiel Fix #2944 1917bb6
@vendethiel vendethiel Fix REPL when env.HOME isn't available - #2945 5162472
@jashkenas Merge pull request #2946 from Nami-Doc/issue2944
Fix #2944
8a59558
Commits on Apr 22, 2013
@xixixao xixixao Fix #1437. Unneeded ref in existential assignment. 7b9699c
@michaelficarra michaelficarra Merge pull request #2951 from xixixao/issue1437
Fix #1437. Unneeded ref in existential assignment.
4b4f6ac
Commits on Apr 27, 2013
@billymoon billymoon give the `-l` flag to literate
remove `-l` from lint, allowing it to be used for literate
d8d7495
@vendethiel vendethiel Merge pull request #2894 from billymoon/master
Literate flag
f451bb5
@vendethiel vendethiel remove --lint. #2894 : rebuild and fix docs e8fae28
@vendethiel vendethiel Fix docs : modify source file instead of built file 4da00e8
@michaelficarra michaelficarra Merge pull request #2963 from Nami-Doc/lint-flag-removal
Lint flag removal
f433247
@vendethiel vendethiel code cleanup 7be996c
@vendethiel vendethiel remove jsl config file and the doc line about it 4ff7fef
Commits on Apr 28, 2013
@marchaefner marchaefner Fixes #2916 -- implicit calls with preceding herecomment 40d2761
@vendethiel vendethiel partly revert 7be996c ba01e36
@vendethiel vendethiel final style edits 63bc7fe
@vendethiel vendethiel Merge pull request #2965 from Nami-Doc/style-cleanup1
Style cleanup
3921e3d
Commits on Apr 29, 2013
@michaelficarra michaelficarra rebuild for some unneccessary parentheses changes
rebuild of 3921e3d
174cd7e
@marchaefner marchaefner Merge remote-tracking branch 'refs/remotes/upstream/master' 05b74f3
@michaelficarra michaelficarra Merge pull request #2933 from marchaefner/master
Fix implicit calls with preceding herecomment
3650d6e
In-Ho Yi keep track of source map information for require()d coffee files b54db2e
Commits on May 08, 2013
@pushrax pushrax Fix 'propeties' typo in docs afd9b44
Commits on May 09, 2013
@michaelficarra michaelficarra Merge pull request #2978 from pushrax/master
Fix 'propeties' typo in docs
088b8b3
Commits on May 15, 2013
@xixixao xixixao Fixes tabbed code test in literate fd47920
Commits on May 25, 2013
@sgentle sgentle Add test for .coffee.md loading 9b1bdd4
@sgentle sgentle Patch node module loader to handle multiple extensions - fixes #2928 & d46a44a
@sgentle sgentle use helpers.isCoffee in test runner c0aac8e
@sgentle sgentle fix style problems 2fd956d
@sgentle sgentle fix style problems part 2 e4407dd
@sgentle sgentle New tests for module importing e7d01b9
@sgentle sgentle Early exit + refactor findExtension 30b2af8
@sgentle sgentle Didn't mean to commit testsymlink 46a0dc6
@vendethiel vendethiel Disallowed `for own in` b3ffd25
Commits on May 26, 2013
@sgentle sgentle fix style problems part 3 012e3c0
@jashkenas Merge pull request #3002 from Nami-Doc/issue3001
Disallowed `for own in`
7c4128e
@jashkenas Merge pull request #2984 from xixixao/literatetest
Fixes tabbed code test in literate
f038d05
Commits on May 31, 2013
@michaelficarra michaelficarra Merge pull request #2085 from stepheneb/ruby-1-9-generate-coffeescrip…
…t-syntax

rake task creates/installs coffeescript.syntax
b85cf53
@michaelficarra michaelficarra remove `cake build:ultraviolet` 2e6a781
@michaelficarra michaelficarra fixes #2934 5496a18
@michaelficarra michaelficarra Merge pull request #2930 from marchaefner/Issue1057
Fixes #1057: Allow catch/finally in single line functions.
0f5ae54
Commits on Jun 02, 2013
@jashkenas Removing Ultraviolet workaround 5e06f7e
@jashkenas Merge pull request #3000 from sgentle/require-extensions
Patch module.prototype.load to enable multiple extensions like .coffee.md
bd45180
@jashkenas Merging in a monkey-patching of Module::load, unfortunately. 7089b02
@jashkenas merge 3298c9c
@jashkenas Removing out of date testing cruft 3423065
@jashkenas Fixing browser build boilerplate. 7b14a6a
@jashkenas CoffeeScript 1.6.3 84b8b5c