Simplify codemirror ipython-mode

[Carreau]

make it a subset of python mode, only with configuration

diff is ugly, here is what the mode look like now

// IPython mode is just a slightly altered Python Mode with `?` beeing a extra
// single operator. Here we define `ipython` mode in the require `python`
// callback to auto-load python mode, which is more likely not the best things
// to do, but at least the simple one for now.

CodeMirror.requireMode('python',function(){

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

        parserConf.singleOperators = new RegExp("^[\\+\\-\\*/%&|\\^~<>!\\?]");
        parserConf.name = 'python'
        return CodeMirror.getMode(conf, parserConf);
    }, 'python');

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

This has been only recently possible because of some changes on CodeMirror side.

[minrk]

Looks good to me, great cleanup!

[Carreau]

Yeah, I'm trying to improve python-mode on CM to also have Cython.
Do you know by any chance where I could find a list of all cython keywords and token that would have to be highlighted ?

[ivanov]

here's a /syntax/pyrex.vim that might help, Matthias:

" Vim syntax file
" Language: Pyrex
" Maintainer:   Marco Barisione <marco.bari@people.it>
" URL:      http://marcobari.altervista.org/pyrex_vim.html
" Last Change:  2009 Nov 09

" For version 5.x: Clear all syntax items
" For version 6.x: Quit when a syntax file was already loaded
if version < 600
  syntax clear
elseif exists("b:current_syntax")
  finish
endif

" Read the Python syntax to start with
if version < 600
  so <sfile>:p:h/python.vim
else
  runtime! syntax/python.vim
  unlet b:current_syntax
endif

" Pyrex extentions
syn keyword pyrexStatement      cdef typedef ctypedef sizeof
syn keyword pyrexType       int long short float double char object void
syn keyword pyrexType       signed unsigned
syn keyword pyrexStructure  struct union enum
syn keyword pyrexInclude    include cimport
syn keyword pyrexAccess     public private property readonly extern
" If someome wants Python's built-ins highlighted probably he
" also wants Pyrex's built-ins highlighted
if exists("python_highlight_builtins") || exists("pyrex_highlight_builtins")
    syn keyword pyrexBuiltin    NULL
endif

" This deletes "from" from the keywords and re-adds it as a
" match with lower priority than pyrexForFrom
syn clear   pythonInclude
syn keyword pythonInclude     import
syn match   pythonInclude     "from"

" With "for[^:]*\zsfrom" VIM does not match "for" anymore, so
" I used the slower "\@<=" form
syn match   pyrexForFrom        "\(for[^:]*\)\@<=from"

" Default highlighting
if version >= 508 || !exists("did_pyrex_syntax_inits")
  if version < 508
    let did_pyrex_syntax_inits = 1
    command -nargs=+ HiLink hi link <args>
  else
    command -nargs=+ HiLink hi def link <args>
  endif
  HiLink pyrexStatement     Statement
  HiLink pyrexType      Type
  HiLink pyrexStructure     Structure
  HiLink pyrexInclude       PreCondit
  HiLink pyrexAccess        pyrexStatement
  if exists("python_highlight_builtins") || exists("pyrex_highlight_builtins")
      HiLink pyrexBuiltin   Function
  endif
  HiLink pyrexForFrom       Statement

  delcommand HiLink
endif

let b:current_syntax = "pyrex"

[Carreau]

Thanks @ivanov, a few more keywords to add to the list. I was astonished not to find a list in the official doc.
Will merge now.