##// END OF EJS Templates
Merge pull request #763 from punchagan/master...
Merge pull request #763 from punchagan/master Set context for shortcuts in ConsoleWidget

File last commit:

r2661:595fc3b9
r4774:ac6d8efc merge
Show More
cocoa_frontend.py
560 lines | 18.8 KiB | text/x-python | PythonLexer
Barry Wark
moved frontend from ipython1-dev. Got engineservice.ThreadedEngineService running, but does nto correctly propagate errors during execute()
r1263 # encoding: utf-8
Barry Wark
pep8 compliance, first pass
r1291 # -*- test-case-name: IPython.frontend.cocoa.tests.test_cocoa_frontend -*-
Barry Wark
moved frontend from ipython1-dev. Got engineservice.ThreadedEngineService running, but does nto correctly propagate errors during execute()
r1263
Barry Wark
pep8 compliance, first pass
r1291 """PyObjC classes to provide a Cocoa frontend to the
Barry Wark
pep8, second pass
r1292 IPython.kernel.engineservice.IEngineBase.
Barry Wark
moved frontend from ipython1-dev. Got engineservice.ThreadedEngineService running, but does nto correctly propagate errors during execute()
r1263
Barry Wark
pep8 compliance, first pass
r1291 To add an IPython interpreter to a cocoa app, instantiate an
IPythonCocoaController in a XIB and connect its textView outlet to an
NSTextView instance in your UI. That's it.
Barry Wark
moved frontend from ipython1-dev. Got engineservice.ThreadedEngineService running, but does nto correctly propagate errors during execute()
r1263
Barry Wark
pep8 compliance, first pass
r1291 Author: Barry Wark
Barry Wark
moved frontend from ipython1-dev. Got engineservice.ThreadedEngineService running, but does nto correctly propagate errors during execute()
r1263 """
__docformat__ = "restructuredtext en"
Barry Wark
pep8 compliance, first pass
r1291 #-----------------------------------------------------------------------------
# Copyright (C) 2008 The IPython Development Team
Barry Wark
moved frontend from ipython1-dev. Got engineservice.ThreadedEngineService running, but does nto correctly propagate errors during execute()
r1263 #
# Distributed under the terms of the BSD License. The full license is in
# the file COPYING, distributed as part of this software.
Barry Wark
pep8 compliance, first pass
r1291 #-----------------------------------------------------------------------------
Barry Wark
moved frontend from ipython1-dev. Got engineservice.ThreadedEngineService running, but does nto correctly propagate errors during execute()
r1263
Barry Wark
pep8 compliance, first pass
r1291 #-----------------------------------------------------------------------------
Barry Wark
moved frontend from ipython1-dev. Got engineservice.ThreadedEngineService running, but does nto correctly propagate errors during execute()
r1263 # Imports
Barry Wark
pep8 compliance, first pass
r1291 #-----------------------------------------------------------------------------
Barry Wark
moved frontend from ipython1-dev. Got engineservice.ThreadedEngineService running, but does nto correctly propagate errors during execute()
r1263
Barry Wark
improved error rendering for cocoa_frontend
r1304 import sys
Barry Wark
moved frontend from ipython1-dev. Got engineservice.ThreadedEngineService running, but does nto correctly propagate errors during execute()
r1263 import objc
Gael Varoquaux
Replace all use of the ast module with the codeop module, and all use of...
r1710 from IPython.external import guid
Barry Wark
moved frontend from ipython1-dev. Got engineservice.ThreadedEngineService running, but does nto correctly propagate errors during execute()
r1263
from Foundation import NSObject, NSMutableArray, NSMutableDictionary,\
NSLog, NSNotificationCenter, NSMakeRange,\
Barry Wark
updates for frontendbase API. Cocoa plugin functional in Objective-C app
r1303 NSLocalizedString, NSIntersectionRange,\
NSString, NSAutoreleasePool
Barry Wark
history partway there. render_error fixes for cocoa frontend
r1279
Barry Wark
moved frontend from ipython1-dev. Got engineservice.ThreadedEngineService running, but does nto correctly propagate errors during execute()
r1263 from AppKit import NSApplicationWillTerminateNotification, NSBeep,\
NSTextView, NSRulerView, NSVerticalRuler
from pprint import saferepr
Barry Wark
fixed frontendbase.FrontEndBase.is_complete
r1278 import IPython
Barry Wark
pep8, second pass
r1292 from IPython.kernel.engineservice import ThreadedEngineService
Gael Varoquaux
Split the frontend base class in different files and add a base class...
r1355 from IPython.frontend.asyncfrontendbase import AsyncFrontEndBase
Barry Wark
moved frontend from ipython1-dev. Got engineservice.ThreadedEngineService running, but does nto correctly propagate errors during execute()
r1263
from twisted.internet.threads import blockingCallFromThread
Barry Wark
added blockID for failures (special case)
r1283 from twisted.python.failure import Failure
Barry Wark
moved frontend from ipython1-dev. Got engineservice.ThreadedEngineService running, but does nto correctly propagate errors during execute()
r1263
Barry Wark
ready for wrapped_execute
r1321 #-----------------------------------------------------------------------------
Barry Wark
moved frontend from ipython1-dev. Got engineservice.ThreadedEngineService running, but does nto correctly propagate errors during execute()
r1263 # Classes to implement the Cocoa frontend
Barry Wark
ready for wrapped_execute
r1321 #-----------------------------------------------------------------------------
Barry Wark
moved frontend from ipython1-dev. Got engineservice.ThreadedEngineService running, but does nto correctly propagate errors during execute()
r1263
# TODO:
Barry Wark
pep8 compliance, first pass
r1291 # 1. use MultiEngineClient and out-of-process engine rather than
# ThreadedEngineService?
Barry Wark
moved frontend from ipython1-dev. Got engineservice.ThreadedEngineService running, but does nto correctly propagate errors during execute()
r1263 # 2. integrate Xgrid launching of engines
Barry Wark
updates for frontendbase API. Cocoa plugin functional in Objective-C app
r1303 class AutoreleasePoolWrappedThreadedEngineService(ThreadedEngineService):
"""Wrap all blocks in an NSAutoreleasePool"""
Barry Wark
moved frontend from ipython1-dev. Got engineservice.ThreadedEngineService running, but does nto correctly propagate errors during execute()
r1263
Barry Wark
improved error rendering for cocoa_frontend
r1304 def wrapped_execute(self, msg, lines):
Barry Wark
updates for frontendbase API. Cocoa plugin functional in Objective-C app
r1303 """wrapped_execute"""
Barry Wark
improved error rendering for cocoa_frontend
r1304 try:
p = NSAutoreleasePool.alloc().init()
Barry Wark
ready for wrapped_execute
r1321 result = super(AutoreleasePoolWrappedThreadedEngineService,
self).wrapped_execute(msg, lines)
Barry Wark
improved error rendering for cocoa_frontend
r1304 finally:
p.drain()
Barry Wark
updates for frontendbase API. Cocoa plugin functional in Objective-C app
r1303
return result
Barry Wark
moved frontend from ipython1-dev. Got engineservice.ThreadedEngineService running, but does nto correctly propagate errors during execute()
r1263
Barry Wark
branch to try non-textview
r1323 class Cell(NSObject):
"""
Representation of the prompts, input and output of a cell in the
frontend
"""
blockNumber = objc.ivar().unsigned_long()
blockID = objc.ivar()
inputBlock = objc.ivar()
output = objc.ivar()
Barry Wark
merged from trunk. cocoa_frontend refactored to keep input prompt and input ranges. no crash, but garbage output
r1322 class CellBlock(object):
"""
Storage for information about text ranges relating to a single cell
"""
Barry Wark
updates for frontendbase API. Cocoa plugin functional in Objective-C app
r1303
Barry Wark
merged from trunk. cocoa_frontend refactored to keep input prompt and input ranges. no crash, but garbage output
r1322 def __init__(self, inputPromptRange, inputRange=None, outputPromptRange=None,
outputRange=None):
super(CellBlock, self).__init__()
self.inputPromptRange = inputPromptRange
self.inputRange = inputRange
self.outputPromptRange = outputPromptRange
self.outputRange = outputRange
def update_ranges_for_insertion(self, text, textRange):
"""Update ranges for text insertion at textRange"""
for r in [self.inputPromptRange,self.inputRange,
self.outputPromptRange, self.outputRange]:
if(r == None):
continue
intersection = NSIntersectionRange(r,textRange)
if(intersection.length == 0): #ranges don't intersect
if r.location >= textRange.location:
r.location += len(text)
else: #ranges intersect
if(r.location > textRange.location):
offset = len(text) - intersection.length
r.length -= offset
r.location += offset
elif(r.location == textRange.location):
r.length += len(text) - intersection.length
else:
r.length -= intersection.length
def update_ranges_for_deletion(self, textRange):
"""Update ranges for text deletion at textRange"""
Barry Wark
updates for frontendbase API. Cocoa plugin functional in Objective-C app
r1303
Barry Wark
merged from trunk. cocoa_frontend refactored to keep input prompt and input ranges. no crash, but garbage output
r1322 for r in [self.inputPromptRange,self.inputRange,
self.outputPromptRange, self.outputRange]:
if(r==None):
continue
intersection = NSIntersectionRange(r, textRange)
if(intersection.length == 0): #ranges don't intersect
if r.location >= textRange.location:
r.location -= textRange.length
else: #ranges intersect
if(r.location > textRange.location):
offset = intersection.length
r.length -= offset
r.location += offset
elif(r.location == textRange.location):
r.length += intersection.length
else:
r.length -= intersection.length
def __repr__(self):
return 'CellBlock('+ str((self.inputPromptRange,
self.inputRange,
self.outputPromptRange,
self.outputRange)) + ')'
Barry Wark
moved frontend from ipython1-dev. Got engineservice.ThreadedEngineService running, but does nto correctly propagate errors during execute()
r1263
Barry Wark
merged from trunk. cocoa_frontend refactored to keep input prompt and input ranges. no crash, but garbage output
r1322
Barry Wark <barrywarkatgmaildotcom>
renamed AsynchronousFrontEndBase to AsyncFrontEndBase
r1315 class IPythonCocoaController(NSObject, AsyncFrontEndBase):
Barry Wark
moved frontend from ipython1-dev. Got engineservice.ThreadedEngineService running, but does nto correctly propagate errors during execute()
r1263 userNS = objc.ivar() #mirror of engine.user_ns (key=>str(value))
waitingForEngine = objc.ivar().bool()
textView = objc.IBOutlet()
def init(self):
self = super(IPythonCocoaController, self).init()
Barry Wark <barrywarkatgmaildotcom>
renamed AsynchronousFrontEndBase to AsyncFrontEndBase
r1315 AsyncFrontEndBase.__init__(self,
Barry Wark
updates for frontendbase API. Cocoa plugin functional in Objective-C app
r1303 engine=AutoreleasePoolWrappedThreadedEngineService())
Barry Wark
moved frontend from ipython1-dev. Got engineservice.ThreadedEngineService running, but does nto correctly propagate errors during execute()
r1263 if(self != None):
self._common_init()
return self
def _common_init(self):
"""_common_init"""
self.userNS = NSMutableDictionary.dictionary()
self.waitingForEngine = False
self.lines = {}
self.tabSpaces = 4
self.tabUsesSpaces = True
Barry Wark
pep8, second pass
r1292 self.currentBlockID = self.next_block_ID()
Barry Wark
merged from trunk. cocoa_frontend refactored to keep input prompt and input ranges. no crash, but garbage output
r1322 self.blockRanges = {} # blockID=>CellBlock
Barry Wark
moved frontend from ipython1-dev. Got engineservice.ThreadedEngineService running, but does nto correctly propagate errors during execute()
r1263
def awakeFromNib(self):
"""awakeFromNib"""
self._common_init()
# Start the IPython engine
self.engine.startService()
NSLog('IPython engine started')
# Register for app termination
Barry Wark
pep8, second pass
r1292 nc = NSNotificationCenter.defaultCenter()
nc.addObserver_selector_name_object_(
self,
'appWillTerminate:',
NSApplicationWillTerminateNotification,
None)
Barry Wark
moved frontend from ipython1-dev. Got engineservice.ThreadedEngineService running, but does nto correctly propagate errors during execute()
r1263
self.textView.setDelegate_(self)
self.textView.enclosingScrollView().setHasVerticalRuler_(True)
Barry Wark
pep8, second pass
r1292 r = NSRulerView.alloc().initWithScrollView_orientation_(
self.textView.enclosingScrollView(),
NSVerticalRuler)
self.verticalRulerView = r
Barry Wark
moved frontend from ipython1-dev. Got engineservice.ThreadedEngineService running, but does nto correctly propagate errors during execute()
r1263 self.verticalRulerView.setClientView_(self.textView)
Barry Wark
pep8, second pass
r1292 self._start_cli_banner()
Barry Wark
merged from trunk. cocoa_frontend refactored to keep input prompt and input ranges. no crash, but garbage output
r1322 self.start_new_block()
Barry Wark
moved frontend from ipython1-dev. Got engineservice.ThreadedEngineService running, but does nto correctly propagate errors during execute()
r1263
def appWillTerminate_(self, notification):
"""appWillTerminate"""
self.engine.stopService()
def complete(self, token):
"""Complete token in engine's user_ns
Parameters
----------
token : string
Result
------
Barry Wark
pep8, second pass
r1292 Deferred result of
IPython.kernel.engineservice.IEngineBase.complete
Barry Wark
moved frontend from ipython1-dev. Got engineservice.ThreadedEngineService running, but does nto correctly propagate errors during execute()
r1263 """
return self.engine.complete(token)
def execute(self, block, blockID=None):
self.waitingForEngine = True
self.willChangeValueForKey_('commandHistory')
Barry Wark
updates for frontendbase API. Cocoa plugin functional in Objective-C app
r1303 d = super(IPythonCocoaController, self).execute(block,
blockID)
Barry Wark
pep8, second pass
r1292 d.addBoth(self._engine_done)
d.addCallback(self._update_user_ns)
Barry Wark
moved frontend from ipython1-dev. Got engineservice.ThreadedEngineService running, but does nto correctly propagate errors during execute()
r1263
return d
Barry Wark
updates for frontendbase API. Cocoa plugin functional in Objective-C app
r1303
def push_(self, namespace):
"""Push dictionary of key=>values to python namespace"""
self.waitingForEngine = True
self.willChangeValueForKey_('commandHistory')
d = self.engine.push(namespace)
d.addBoth(self._engine_done)
d.addCallback(self._update_user_ns)
def pull_(self, keys):
"""Pull keys from python namespace"""
Barry Wark
moved frontend from ipython1-dev. Got engineservice.ThreadedEngineService running, but does nto correctly propagate errors during execute()
r1263
Barry Wark
updates for frontendbase API. Cocoa plugin functional in Objective-C app
r1303 self.waitingForEngine = True
result = blockingCallFromThread(self.engine.pull, keys)
self.waitingForEngine = False
Barry Wark <barrywarkatgmaildotcom>
added encoding and objc.signature to executeFileAtPath_encoding_
r1316 @objc.signature('v@:@I')
def executeFileAtPath_encoding_(self, path, encoding):
Barry Wark
updates for frontendbase API. Cocoa plugin functional in Objective-C app
r1303 """Execute file at path in an empty namespace. Update the engine
user_ns with the resulting locals."""
lines,err = NSString.stringWithContentsOfFile_encoding_error_(
path,
Barry Wark <barrywarkatgmaildotcom>
added encoding and objc.signature to executeFileAtPath_encoding_
r1316 encoding,
Barry Wark
updates for frontendbase API. Cocoa plugin functional in Objective-C app
r1303 None)
self.engine.execute(lines)
Barry Wark
pep8, second pass
r1292 def _engine_done(self, x):
Barry Wark
moved frontend from ipython1-dev. Got engineservice.ThreadedEngineService running, but does nto correctly propagate errors during execute()
r1263 self.waitingForEngine = False
self.didChangeValueForKey_('commandHistory')
return x
Barry Wark
pep8, second pass
r1292 def _update_user_ns(self, result):
Barry Wark
moved frontend from ipython1-dev. Got engineservice.ThreadedEngineService running, but does nto correctly propagate errors during execute()
r1263 """Update self.userNS from self.engine's namespace"""
d = self.engine.keys()
Barry Wark
pep8, second pass
r1292 d.addCallback(self._get_engine_namespace_values_for_keys)
Barry Wark
moved frontend from ipython1-dev. Got engineservice.ThreadedEngineService running, but does nto correctly propagate errors during execute()
r1263
return result
Barry Wark
pep8, second pass
r1292 def _get_engine_namespace_values_for_keys(self, keys):
Barry Wark
moved frontend from ipython1-dev. Got engineservice.ThreadedEngineService running, but does nto correctly propagate errors during execute()
r1263 d = self.engine.pull(keys)
Barry Wark
pep8, second pass
r1292 d.addCallback(self._store_engine_namespace_values, keys=keys)
Barry Wark
moved frontend from ipython1-dev. Got engineservice.ThreadedEngineService running, but does nto correctly propagate errors during execute()
r1263
Barry Wark
pep8, second pass
r1292 def _store_engine_namespace_values(self, values, keys=[]):
Barry Wark
moved frontend from ipython1-dev. Got engineservice.ThreadedEngineService running, but does nto correctly propagate errors during execute()
r1263 assert(len(values) == len(keys))
self.willChangeValueForKey_('userNS')
for (k,v) in zip(keys,values):
self.userNS[k] = saferepr(v)
self.didChangeValueForKey_('userNS')
Barry Wark
updates for frontendbase API. Cocoa plugin functional in Objective-C app
r1303 def update_cell_prompt(self, result, blockID=None):
Barry Wark
merged from trunk. cocoa_frontend refactored to keep input prompt and input ranges. no crash, but garbage output
r1322 print self.blockRanges
Barry Wark
pep8, second pass
r1292 if(isinstance(result, Failure)):
Barry Wark
merged from trunk. cocoa_frontend refactored to keep input prompt and input ranges. no crash, but garbage output
r1322 prompt = self.input_prompt()
Barry Wark
pep8, second pass
r1292 else:
Barry Wark
merged from trunk. cocoa_frontend refactored to keep input prompt and input ranges. no crash, but garbage output
r1322 prompt = self.input_prompt(number=result['number'])
r = self.blockRanges[blockID].inputPromptRange
self.insert_text(prompt,
textRange=r,
Barry Wark
pep8, second pass
r1292 scrollToVisible=False
)
return result
def render_result(self, result):
blockID = result['blockID']
Barry Wark
merged from trunk. cocoa_frontend refactored to keep input prompt and input ranges. no crash, but garbage output
r1322 inputRange = self.blockRanges[blockID].inputRange
Barry Wark
pep8, second pass
r1292 del self.blockRanges[blockID]
#print inputRange,self.current_block_range()
self.insert_text('\n' +
Barry Wark
improved error rendering for cocoa_frontend
r1304 self.output_prompt(number=result['number']) +
Barry Wark
pep8, second pass
r1292 result.get('display',{}).get('pprint','') +
'\n\n',
textRange=NSMakeRange(inputRange.location+inputRange.length,
0))
return result
def render_error(self, failure):
Barry Wark
merged from trunk. cocoa_frontend refactored to keep input prompt and input ranges. no crash, but garbage output
r1322 print failure
blockID = failure.blockID
inputRange = self.blockRanges[blockID].inputRange
Barry Wark
improved error rendering for cocoa_frontend
r1304 self.insert_text('\n' +
self.output_prompt() +
'\n' +
failure.getErrorMessage() +
Barry Wark
merged from trunk. cocoa_frontend refactored to keep input prompt and input ranges. no crash, but garbage output
r1322 '\n\n',
textRange=NSMakeRange(inputRange.location +
inputRange.length,
0))
Barry Wark
pep8, second pass
r1292 self.start_new_block()
return failure
def _start_cli_banner(self):
Barry Wark
moved frontend from ipython1-dev. Got engineservice.ThreadedEngineService running, but does nto correctly propagate errors during execute()
r1263 """Print banner"""
Barry Wark
pep8 compliance, first pass
r1291 banner = """IPython1 %s -- An enhanced Interactive Python.""" % \
IPython.__version__
Barry Wark
moved frontend from ipython1-dev. Got engineservice.ThreadedEngineService running, but does nto correctly propagate errors during execute()
r1263
self.insert_text(banner + '\n\n')
Barry Wark
pep8, second pass
r1292
def start_new_block(self):
""""""
self.currentBlockID = self.next_block_ID()
Barry Wark
merged from trunk. cocoa_frontend refactored to keep input prompt and input ranges. no crash, but garbage output
r1322 self.blockRanges[self.currentBlockID] = self.new_cell_block()
self.insert_text(self.input_prompt(),
textRange=self.current_block_range().inputPromptRange)
Barry Wark
pep8, second pass
r1292
def next_block_ID(self):
Gael Varoquaux
Replace all use of the ast module with the codeop module, and all use of...
r1710 return guid.generate()
Barry Wark
pep8, second pass
r1292
Barry Wark
merged from trunk. cocoa_frontend refactored to keep input prompt and input ranges. no crash, but garbage output
r1322 def new_cell_block(self):
"""A new CellBlock at the end of self.textView.textStorage()"""
Barry Wark
branch to try non-textview
r1323 return CellBlock(NSMakeRange(self.textView.textStorage().length(),
Barry Wark
merged from trunk. cocoa_frontend refactored to keep input prompt and input ranges. no crash, but garbage output
r1322 0), #len(self.input_prompt())),
Barry Wark
branch to try non-textview
r1323 NSMakeRange(self.textView.textStorage().length(),# + len(self.input_prompt()),
Barry Wark
merged from trunk. cocoa_frontend refactored to keep input prompt and input ranges. no crash, but garbage output
r1322 0))
Barry Wark
pep8, second pass
r1292 def current_block_range(self):
return self.blockRanges.get(self.currentBlockID,
Barry Wark
merged from trunk. cocoa_frontend refactored to keep input prompt and input ranges. no crash, but garbage output
r1322 self.new_cell_block())
Barry Wark
pep8, second pass
r1292
Barry Wark
pep8, third pass
r1293 def current_block(self):
Barry Wark
pep8, second pass
r1292 """The current block's text"""
Barry Wark
merged from trunk. cocoa_frontend refactored to keep input prompt and input ranges. no crash, but garbage output
r1322 return self.text_for_range(self.current_block_range().inputRange)
Barry Wark
pep8, second pass
r1292
Barry Wark
pep8, third pass
r1293 def text_for_range(self, textRange):
"""text_for_range"""
Barry Wark
pep8, second pass
r1292
ts = self.textView.textStorage()
return ts.string().substringWithRange_(textRange)
Barry Wark
pep8, third pass
r1293 def current_line(self):
Barry Wark
merged from trunk. cocoa_frontend refactored to keep input prompt and input ranges. no crash, but garbage output
r1322 block = self.text_for_range(self.current_block_range().inputRange)
Barry Wark
pep8, second pass
r1292 block = block.split('\n')
return block[-1]
def insert_text(self, string=None, textRange=None, scrollToVisible=True):
"""Insert text into textView at textRange, updating blockRanges
as necessary
"""
if(textRange == None):
#range for end of text
textRange = NSMakeRange(self.textView.textStorage().length(), 0)
self.textView.replaceCharactersInRange_withString_(
textRange, string)
Barry Wark
merged from trunk. cocoa_frontend refactored to keep input prompt and input ranges. no crash, but garbage output
r1322
for r in self.blockRanges.itervalues():
r.update_ranges_for_insertion(string, textRange)
self.textView.setSelectedRange_(textRange)
Barry Wark
pep8, second pass
r1292 if(scrollToVisible):
self.textView.scrollRangeToVisible_(textRange)
def replace_current_block_with_string(self, textView, string):
textView.replaceCharactersInRange_withString_(
Barry Wark
merged from trunk. cocoa_frontend refactored to keep input prompt and input ranges. no crash, but garbage output
r1322 self.current_block_range().inputRange,
string)
self.current_block_range().inputRange.length = len(string)
Barry Wark
pep8, second pass
r1292 r = NSMakeRange(textView.textStorage().length(), 0)
textView.scrollRangeToVisible_(r)
textView.setSelectedRange_(r)
def current_indent_string(self):
"""returns string for indent or None if no indent"""
Barry Wark
oops... old habits die hard.
r1301 return self._indent_for_block(self.current_block())
Barry Wark
fix for cocoa frontend current_indent_string; refactor to make testing easier and added a test for _indent_for_block
r1300
def _indent_for_block(self, block):
lines = block.split('\n')
if(len(lines) > 1):
currentIndent = len(lines[-1]) - len(lines[-1].lstrip())
Barry Wark
pep8, second pass
r1292 if(currentIndent == 0):
currentIndent = self.tabSpaces
if(self.tabUsesSpaces):
result = ' ' * currentIndent
else:
result = '\t' * (currentIndent/self.tabSpaces)
else:
result = None
return result
# NSTextView delegate methods...
Barry Wark
moved frontend from ipython1-dev. Got engineservice.ThreadedEngineService running, but does nto correctly propagate errors during execute()
r1263 def textView_doCommandBySelector_(self, textView, selector):
assert(textView == self.textView)
NSLog("textView_doCommandBySelector_: "+selector)
if(selector == 'insertNewline:'):
Barry Wark
pep8, second pass
r1292 indent = self.current_indent_string()
Barry Wark
moved frontend from ipython1-dev. Got engineservice.ThreadedEngineService running, but does nto correctly propagate errors during execute()
r1263 if(indent):
Barry Wark
pep8, third pass
r1293 line = indent + self.current_line()
Barry Wark
moved frontend from ipython1-dev. Got engineservice.ThreadedEngineService running, but does nto correctly propagate errors during execute()
r1263 else:
Barry Wark
pep8, third pass
r1293 line = self.current_line()
Barry Wark
moved frontend from ipython1-dev. Got engineservice.ThreadedEngineService running, but does nto correctly propagate errors during execute()
r1263
Barry Wark
pep8, third pass
r1293 if(self.is_complete(self.current_block())):
self.execute(self.current_block(),
Barry Wark
moved frontend from ipython1-dev. Got engineservice.ThreadedEngineService running, but does nto correctly propagate errors during execute()
r1263 blockID=self.currentBlockID)
Barry Wark
pep8, second pass
r1292 self.start_new_block()
Barry Wark
history partway there. render_error fixes for cocoa frontend
r1279
Barry Wark
moved frontend from ipython1-dev. Got engineservice.ThreadedEngineService running, but does nto correctly propagate errors during execute()
r1263 return True
return False
elif(selector == 'moveUp:'):
Barry Wark
pep8, third pass
r1293 prevBlock = self.get_history_previous(self.current_block())
Barry Wark
history partway there. render_error fixes for cocoa frontend
r1279 if(prevBlock != None):
Barry Wark
pep8, second pass
r1292 self.replace_current_block_with_string(textView, prevBlock)
Barry Wark
history partway there. render_error fixes for cocoa frontend
r1279 else:
NSBeep()
Barry Wark
moved frontend from ipython1-dev. Got engineservice.ThreadedEngineService running, but does nto correctly propagate errors during execute()
r1263 return True
elif(selector == 'moveDown:'):
Barry Wark
fixes and tests for history
r1281 nextBlock = self.get_history_next()
Barry Wark
history partway there. render_error fixes for cocoa frontend
r1279 if(nextBlock != None):
Barry Wark
pep8, second pass
r1292 self.replace_current_block_with_string(textView, nextBlock)
Barry Wark
history partway there. render_error fixes for cocoa frontend
r1279 else:
NSBeep()
Barry Wark
moved frontend from ipython1-dev. Got engineservice.ThreadedEngineService running, but does nto correctly propagate errors during execute()
r1263 return True
elif(selector == 'moveToBeginningOfParagraph:'):
Barry Wark
pep8 compliance, first pass
r1291 textView.setSelectedRange_(NSMakeRange(
Barry Wark
merged from trunk. cocoa_frontend refactored to keep input prompt and input ranges. no crash, but garbage output
r1322 self.current_block_range().inputRange.location,
0))
Barry Wark
moved frontend from ipython1-dev. Got engineservice.ThreadedEngineService running, but does nto correctly propagate errors during execute()
r1263 return True
elif(selector == 'moveToEndOfParagraph:'):
Barry Wark
pep8 compliance, first pass
r1291 textView.setSelectedRange_(NSMakeRange(
Barry Wark
merged from trunk. cocoa_frontend refactored to keep input prompt and input ranges. no crash, but garbage output
r1322 self.current_block_range().inputRange.location + \
self.current_block_range().inputRange.length, 0))
Barry Wark
moved frontend from ipython1-dev. Got engineservice.ThreadedEngineService running, but does nto correctly propagate errors during execute()
r1263 return True
elif(selector == 'deleteToEndOfParagraph:'):
Barry Wark
pep8 compliance, first pass
r1291 if(textView.selectedRange().location <= \
Barry Wark
pep8, second pass
r1292 self.current_block_range().location):
Barry Wark
merged from trunk. cocoa_frontend refactored to keep input prompt and input ranges. no crash, but garbage output
r1322 raise NotImplemented()
Barry Wark
moved frontend from ipython1-dev. Got engineservice.ThreadedEngineService running, but does nto correctly propagate errors during execute()
r1263
return False # don't actually handle the delete
elif(selector == 'insertTab:'):
Barry Wark
pep8, third pass
r1293 if(len(self.current_line().strip()) == 0): #only white space
Barry Wark
moved frontend from ipython1-dev. Got engineservice.ThreadedEngineService running, but does nto correctly propagate errors during execute()
r1263 return False
else:
self.textView.complete_(self)
return True
elif(selector == 'deleteBackward:'):
#if we're at the beginning of the current block, ignore
Barry Wark
pep8 compliance, first pass
r1291 if(textView.selectedRange().location == \
Barry Wark
merged from trunk. cocoa_frontend refactored to keep input prompt and input ranges. no crash, but garbage output
r1322 self.current_block_range().inputRange.location):
Barry Wark
moved frontend from ipython1-dev. Got engineservice.ThreadedEngineService running, but does nto correctly propagate errors during execute()
r1263 return True
else:
Barry Wark
merged from trunk. cocoa_frontend refactored to keep input prompt and input ranges. no crash, but garbage output
r1322 for r in self.blockRanges.itervalues():
deleteRange = textView.selectedRange
if(deleteRange.length == 0):
deleteRange.location -= 1
deleteRange.length = 1
r.update_ranges_for_deletion(deleteRange)
Barry Wark
moved frontend from ipython1-dev. Got engineservice.ThreadedEngineService running, but does nto correctly propagate errors during execute()
r1263 return False
return False
Barry Wark
pep8 compliance, first pass
r1291 def textView_shouldChangeTextInRanges_replacementStrings_(self,
textView, ranges, replacementStrings):
Barry Wark
moved frontend from ipython1-dev. Got engineservice.ThreadedEngineService running, but does nto correctly propagate errors during execute()
r1263 """
Delegate method for NSTextView.
Barry Wark
pep8 compliance, first pass
r1291 Refuse change text in ranges not at end, but make those changes at
end.
Barry Wark
moved frontend from ipython1-dev. Got engineservice.ThreadedEngineService running, but does nto correctly propagate errors during execute()
r1263 """
assert(len(ranges) == len(replacementStrings))
allow = True
for r,s in zip(ranges, replacementStrings):
r = r.rangeValue()
if(textView.textStorage().length() > 0 and
Barry Wark
merged from trunk. cocoa_frontend refactored to keep input prompt and input ranges. no crash, but garbage output
r1322 r.location < self.current_block_range().inputRange.location):
Barry Wark
moved frontend from ipython1-dev. Got engineservice.ThreadedEngineService running, but does nto correctly propagate errors during execute()
r1263 self.insert_text(s)
allow = False
return allow
Barry Wark
pep8 compliance, first pass
r1291 def textView_completions_forPartialWordRange_indexOfSelectedItem_(self,
textView, words, charRange, index):
Barry Wark
moved frontend from ipython1-dev. Got engineservice.ThreadedEngineService running, but does nto correctly propagate errors during execute()
r1263 try:
Barry Wark
pep8 compliance, first pass
r1291 ts = textView.textStorage()
token = ts.string().substringWithRange_(charRange)
Barry Wark
moved frontend from ipython1-dev. Got engineservice.ThreadedEngineService running, but does nto correctly propagate errors during execute()
r1263 completions = blockingCallFromThread(self.complete, token)
except:
completions = objc.nil
NSBeep()
return (completions,0)