upstream/ipython Commit - r10416:22418c90

1

// This is an ipython mode for CodeMirror. We started from the CM Python mode and renamed

2

// it to ipython. We have then marked all other changes we have made to the file.

3

1

CodeMirror.defineMode("ipython", function(conf, parserConf) {

4

CodeMirror.defineMode("ipython", function(conf, parserConf) {

2

var ERRORCLASS = 'error';

5

var ERRORCLASS = 'error';

3

6

5

return new RegExp("^((" + words.join(")|(") + "))\\b");

8

return new RegExp("^((" + words.join(")|(") + "))\\b");

6

}

9

}

7

10

8

var singleOperators = parserConf.singleOperators || new RegExp("^[\\+\\-\\*/%&|\\^~<>!]");

11

// IPython-specific changes: add '?' as recognized character using \\?

12

var singleOperators = parserConf.singleOperators || new RegExp("^[\\+\\-\\*/%&|\\^~<>!\\?]");

13

// End IPython changes.

9

var singleDelimiters = parserConf.singleDelimiters || new RegExp('^[\\(\\)\\[\\]\\{\\}@,:`=;\\.]');

14

var singleDelimiters = parserConf.singleDelimiters || new RegExp('^[\\(\\)\\[\\]\\{\\}@,:`=;\\.]');

10

var doubleOperators = parserConf.doubleOperators || new RegExp("^((==)|(!=)|(<=)|(>=)|(<>)|(<<)|(>>)|(//)|(\\*\\*))");

15

var doubleOperators = parserConf.doubleOperators || new RegExp("^((==)|(!=)|(<=)|(>=)|(<>)|(<<)|(>>)|(//)|(\\*\\*))");

11

var doubleDelimiters = parserConf.doubleDelimiters || new RegExp("^((\\+=)|(\\-=)|(\\*=)|(%=)|(/=)|(&=)|(\\|=)|(\\^=))");

16

var doubleDelimiters = parserConf.doubleDelimiters || new RegExp("^((\\+=)|(\\-=)|(\\*=)|(%=)|(/=)|(&=)|(\\|=)|(\\^=))");

337

return external;

342

return external;

338

});

343

});

339

344

340

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

345

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

	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

+            // This is an ipython mode for CodeMirror. We started from the CM Python mode and renamed
+            // it to ipython. We have then marked all other changes we have made to the file.
             CodeMirror.defineMode("ipython", function(conf, parserConf) {
                 var ERRORCLASS = 'error';
                     return new RegExp("^((" + words.join(")|(") + "))\\b");
                 }
-                var singleOperators = parserConf.singleOperators || new RegExp("^[\\+\\-\\*/%&|\\^~<>!]");
+            	// IPython-specific changes: add '?' as recognized character using \\?
+                var singleOperators = parserConf.singleOperators || new RegExp("^[\\+\\-\\*/%&|\\^~<>!\\?]");
+            	// End IPython changes.
                 var singleDelimiters = parserConf.singleDelimiters || new RegExp('^[\\(\\)\\[\\]\\{\\}@,:`=;\\.]');
                 var doubleOperators = parserConf.doubleOperators || new RegExp("^((==)|(!=)|(<=)|(>=)|(<>)|(<<)|(>>)|(//)|(\\*\\*))");
                 var doubleDelimiters = parserConf.doubleDelimiters || new RegExp("^((\\+=)|(\\-=)|(\\*=)|(%=)|(/=)|(&=)|(\\|=)|(\\^=))");
                 return external;
             });
-            CodeMirror.defineMIME("text/x-python", "python");
+            CodeMirror.defineMIME("text/x-ipython", "ipython");