Merged with maximsch2 main repo

Author: z-m-k

SublimeIPythonNotebook.tmLanguage

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 <plist version="1.0">
 <dict>
 	<key>fileTypes</key>
@@ -27,7 +27,7 @@
 				</dict>
 			</dict>
 			<key>contentName</key>
-			<string>ipynb.source.input.r</string>
+			<string>ipynb.source.input.r source.r</string>
 			<key>end</key>
 			<string>\#\/Input</string>
 			<key>endCaptures</key>
@@ -46,6 +46,38 @@
 				</dict>
 			</array>
 		</dict>
+		<dict>
+			<key>begin</key>
+			<string>\#Markdown
+</string>
+			<key>beginCaptures</key>
+			<dict>
+				<key>0</key>
+				<dict>
+					<key>name</key>
+					<string>comment</string>
+				</dict>
+			</dict>
+			<key>contentName</key>
+			<string>ipynb.text.tex.latex text.tex.latex</string>
+			<key>end</key>
+			<string>\#\/Markdown</string>
+			<key>endCaptures</key>
+			<dict>
+				<key>0</key>
+				<dict>
+					<key>name</key>
+					<string>comment</string>
+				</dict>
+			</dict>
+			<key>patterns</key>
+			<array>
+				<dict>
+					<key>include</key>
+					<string>text.tex.latex</string>
+				</dict>
+			</array>
+		</dict>
 		<dict>
 			<key>begin</key>
 			<string>\#Input\[(.*)\]\n</string>
@@ -58,7 +90,7 @@
 				</dict>
 			</dict>
 			<key>contentName</key>
-			<string>ipynb.source.input.python</string>
+			<string>ipynb.source.input.python source.python</string>
 			<key>end</key>
 			<string>(\#\/Input\[\1\])$</string>
 			<key>endCaptures</key>

SublimeIPythonNotebook.tmLanguage.JSON

@@ -14,7 +14,7 @@
 
          {
 
-           "contentName": "ipynb.source.input.r",
+           "contentName": "ipynb.source.input.r source.r",
            "begin": "\\#Input-R\\[.*\\]\n",
            "end": "\\#\\/Input",
            "beginCaptures": {
@@ -30,8 +30,27 @@
            ]
         },
 
+         {
+
+           "contentName": "ipynb.text.tex.latex text.tex.latex",
+           "begin": "\\#Markdown\n",
+           "end": "\\#\\/Markdown",
+           "beginCaptures": {
+              "0": { "name": "comment"}
+            },
+           "endCaptures": {
+              "0": { "name": "comment"}
+            },
+           "patterns": [
+                {
+                  "include": "text.tex.latex"
+                },
+           ]
+        },
+
+
         { 
-          "contentName": "ipynb.source.input.python",
+          "contentName": "ipynb.source.input.python source.python",
           "begin": "\\#Input\\[(.*)\\]\\n",
           "end": "(\\#\\/Input\\[\\1\\])$",
           "patterns": [

TODO.md

@@ -6,4 +6,12 @@
 - Support set_next_input
 - Add an option of saving a backup copy of notebook json file (use git to have all copies?):
     - For now it is possible to use inb_open_as_ipynb command
-- Support image preview in some external program
+- Support image preview in some external program
+
+BUGS:
+
+Wrong highlighting for open """ . 
+
+TODO for IPython 1.0
+
+- support stdin input for %debug, raw_input and so on

ipy_connection.py

@@ -2,7 +2,7 @@
 # Copyright (c) 2013, Maxim Grechkin
 # This file is licensed under GNU General Public License version 3
 # See COPYING for details.
-
+from __future__ import print_function
 import json
 import uuid
 
@@ -23,33 +23,42 @@
     from external.websocket import websocket
     from external.websocket.websocket import *
     from urlparse import urlparse
-    from urllib2 import urlopen
-    from urllib2 import Request
+    from urllib2 import urlopen, Request, ProxyHandler, build_opener, install_opener
 else:
     import _thread
-    from SublimeIPythonNotebook.external import nbformat3 as nbformat
-    from SublimeIPythonNotebook.external.websocket import websocket3 as websocket
-    from SublimeIPythonNotebook.external.websocket.websocket3 import *
-    from urllib.request import urlopen, Request
+    from .external import nbformat3 as nbformat
+    from .external.websocket import websocket3 as websocket
+    from .external.websocket.websocket3 import *
+    from urllib.request import urlopen, Request, ProxyHandler, build_opener, install_opener
     from urllib.parse import urlparse
 
 
 
+
+def install_proxy_opener():
+    proxy = ProxyHandler({})
+    opener = build_opener(proxy)
+    install_opener(opener)
+
+install_proxy_opener()
+
 def create_uid():
     return str(uuid.uuid4())
 
-
 def get_notebooks(baseurl):
+    target_url = "http://%s/notebooks" % baseurl
     try:
-        req = urlopen("http://" + baseurl + "/notebooks")
+        req = urlopen(target_url)
         try:
             encoding = req.headers.get_content_charset()
             body = req.readall().decode(encoding)
         except AttributeError:
             body = req.read()
         data = json.loads(body)
         return data
-    except:
+    except Exception as e:
+        print("Error during loading notebook list from ", target_url)
+        print(e)
         return None
 
 def create_new_notebook(baseurl):

ipy_view.py

@@ -2,11 +2,11 @@
 # Copyright (c) 2013, Maxim Grechkin
 # This file is licensed under GNU General Public License version 3
 # See COPYING for details.
-
+from __future__ import print_function
 import sublime
 try:
-    from SublimeIPythonNotebook import ipy_connection
-except ImportError:
+    from . import ipy_connection
+except:
     import ipy_connection
 import re
 
@@ -97,6 +97,9 @@ def get_input_content(self):
             return self.view.substr(input_region)
         else:
             return ""
+    
+    def check_R(self):
+        pass
 
 
 class CodeCellView(BaseCellView):
@@ -210,7 +213,7 @@ def rewrite_prompt_number(self, edit):
         out_reg = self.get_region("inb_output")
         line = self.view.line(out_reg.begin() - 1)
         self.view.replace(edit, line, "#Output[%s]" % self.prompt)
-        
+
 
 
     def output_result(self, edit):
@@ -285,7 +288,7 @@ def __init__(self, view, notebook_id, baseurl):
         self.baseurl = baseurl
         view.set_scratch(True)
         #view.set_syntax_file("Packages/Python/Python.tmLanguage")
-        view.set_syntax_file("Packages/SublimeIPythonNotebook/SublimeIPythonNotebook.tmLanguage")
+        view.set_syntax_file("Packages/IPython Notebook/SublimeIPythonNotebook.tmLanguage")
         view.settings().set("ipython_notebook", True)
         self.cells = []
         self.notebook_id = notebook_id
@@ -356,7 +359,7 @@ def on_modified(self):
         for s in self.view.sel():
             for i, reg in enumerate(regset):
                 reg = sublime.Region(reg.begin()+1, reg.end()-1)
-                if reg.contains(s):
+                if reg.contains(s) and (i < len(self.cells)):
                     self.cells[i].check_R()
                     break
 
@@ -461,7 +464,7 @@ def render_notebook(self, edit):
 
         for cell in self.cells:
             cell.draw(edit)
-        
+
         if len(self.cells) > 0:
             self.cells[0].select()
 
@@ -484,6 +487,11 @@ def set_status():
         sublime.set_timeout(set_status, 0)
 
     def handle_completions(self, view, prefix, locations):
+        cell_index = self.get_current_cell_index()
+        if cell_index < 0:
+            return None
+        if not isinstance(self.cells[cell_index], CodeCellView):
+            return None
         sel = view.sel()
         if len(sel) > 1:
             return []
@@ -492,7 +500,7 @@ def handle_completions(self, view, prefix, locations):
         row, col = view.rowcol(sel.begin())
         compl = self.kernel.get_completitions(line, col, timeout=0.7)
 
-        
+
         if len(compl) > 0:
             def get_last_word(s): # needed for file/directory completion
                 if s.endswith("/"):
@@ -668,4 +676,4 @@ def on_close(self, view):
         if id in self.views:
         	del self.views[id]
 
-manager = NotebookViewManager()
+manager = NotebookViewManager()

subl_ipy_notebook.py

@@ -2,12 +2,12 @@
 # Copyright (c) 2013, Maxim Grechkin
 # This file is licensed under GNU General Public License version 3
 # See COPYING for details.
-
+from __future__ import print_function
 import sublime
 import sublime_plugin
 try:
-    from SublimeIPythonNotebook import ipy_view, ipy_connection
-except ImportError:
+    from . import ipy_view, ipy_connection
+except:
     import ipy_view, ipy_connection
 
 
@@ -29,9 +29,19 @@ def on_close(self, view):
     	manager.on_close(view)
 
 
+def get_last_used_address():
+	settings = sublime.load_settings("SublimeIPythonNotebook.sublime-settings")
+	return settings.get("default_address", "127.0.0.1:8888")
+
+
+def set_last_used_address(value):
+	settings = sublime.load_settings("SublimeIPythonNotebook.sublime-settings")
+	settings.set("default_address", value)
+	sublime.save_settings("SublimeIPythonNotebook.sublime-settings")
+
 class InbPromptListNotebooksCommand(sublime_plugin.WindowCommand):
     def run(self):
-        self.window.show_input_panel("Notebook host:port : ", "127.0.0.1:8888",
+        self.window.show_input_panel("Notebook host:port : ", get_last_used_address(),
                                      self.on_done, None, None)
 
     def on_done(self, line):
@@ -43,8 +53,9 @@ def run(self, baseurl):
         self.baseurl = baseurl
         nbs = ipy_connection.get_notebooks(baseurl)
         if nbs is None:
-            print ("Cannot get a list of notebooks")
+            print("Cannot get a list of notebooks")
             return
+        set_last_used_address(baseurl)
         self.nbs = nbs
         lst = ["0: Create New Notebook\n"]
         for i, nb in enumerate(nbs):