upstream/ipython Files · IPython/frontend/html/notebook/static/codemirror/mode/diff/diff.js

Merge pull request from takluyver/cell-magics-wholecell...

Merge pull request from takluyver/cell-magics-wholecell Separate InputSplitter for transforming whole cells This allows cell magics to include blank lines once again (closes ). InteractiveShell now has two input splitters: - `input_splitter` is used to determine when a block of input is complete, so you can use a cell magic in the terminal by leaving a blank line at the end. - `input_transformer_manager` is used to transform whole cells, so cell magics affect the whole of their cell. I removed the similar concept of 'input modes' for InputSplitter, because it was bound to get conflated, and it made the code rather hard to follow.

Matthias BUSSONNIER - - Load All Authors

File last commit:

r8053:58574fbf


                r10256:410df964

Download file

             diff.js
        
                    32 lines
            
             | 670 B
            
                | application/javascript
            
             |
                JavascriptLexer
            
             / IPython / frontend / html / notebook / static / codemirror / mode / diff / diff.js
          
                    History
                
                 |
                  Annotation
                 | Raw
                 |Copy content
                 |Copy permalink

      CodeMirror.defineMode("diff", function() {

        var TOKEN_NAMES = {

          '+': 'tag',

          '-': 'string',

          '@': 'meta'

        };

        return {

          token: function(stream) {

            var tw_pos = stream.string.search(/[\t ]+?$/);

            if (!stream.sol() || tw_pos === 0) {

              stream.skipToEnd();

              return ("error " + (

                TOKEN_NAMES[stream.string.charAt(0)] || '')).replace(/ $/, '');

            }

            var token_name = TOKEN_NAMES[stream.peek()] || stream.skipToEnd();

            if (tw_pos === -1) {

              stream.skipToEnd();

            } else {

              stream.pos = tw_pos;

            }

            return token_name;

          }

        };

      });

      CodeMirror.defineMIME("text/x-diff", "diff");

	Site-wide shortcuts
/	Use quick search box
g h	Goto home page
g g	Goto my private gists page
g G	Goto my public gists page
g 0-9	Goto bookmarked items from 0-9
n r	New repository page
n g	New gist page

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository access permissions settings
t s	Toggle sidebar on some pages

				CodeMirror.defineMode("diff", function() {

				var TOKEN_NAMES = {
				'+': 'tag',
				'-': 'string',
				'@': 'meta'
				};

				return {
				token: function(stream) {
				var tw_pos = stream.string.search(/[\t ]+?$/);

				if (!stream.sol() \|\| tw_pos === 0) {
				stream.skipToEnd();
				return ("error " + (
				TOKEN_NAMES[stream.string.charAt(0)] \|\| '')).replace(/ $/, '');
				}

				var token_name = TOKEN_NAMES[stream.peek()] \|\| stream.skipToEnd();

				if (tw_pos === -1) {
				stream.skipToEnd();
				} else {
				stream.pos = tw_pos;
				}

				return token_name;
				}
				};
				});

				CodeMirror.defineMIME("text/x-diff", "diff");