Commit graph

368 commits

Author SHA1 Message Date
Nathaniel Nicandro
321efd4c9c Refactor jupyter-repl-update-display
* jupyter-repl.el (jupyter-delete-display-at-point): New helper function.
(jupyter-repl-update-display): Use new helper function. Use
`jupyter-with-insertion-bounds` to obtain the region to highlight after
insertion. Use `jupyter-insert-with-id` for insertion. Use
`pulse-momentarily-highlight-region`.
2018-11-13 17:46:07 -06:00
Nathaniel Nicandro
e01f8df624 Remove jupyter-repl-insert-message
The purpose of this function was to conveniently insert a message property list
and allow contributors to perform post insert fixing up depending on the
mimetype inserted via the method `jupyter-repl-after-insert-message`. This same
effect can be done by extending `jupyter-insert` without the need of adding a
new method.

* jupyter-repl.el (jupyter-repl-insert-message):
(jupyter-repl-after-insert-message): Remove.
(jupyter-inspect): Replace calls to `jupyter-repl-insert-message` with
`jupyter-insert`.

* jupyter-python.el (jupyter-repl-after-insert-message): Replace with
`jupyter-insert` :around method.
2018-11-13 17:46:07 -06:00
Nathaniel Nicandro
75a08c26d0 Implement jupyter-insert method
The goal of this method is to act as a single entry point for insertion of
kernel results in any context. One would simply add another method to handle a
specific context.

* jupyter-base.el (jupyter-mime-types):
(jupyter-nongraphic-mime-types): New variables that give mime-types that can be
handled.
(jupyter-insert): New method for dispatching to code that inserts mimetype
representations in the current buffer.

* jupyter-mime.el: New file.
(jupyter-display-ids):
(jupyter-handle-control-codes):
(jupyter-fontify-buffers):
(jupyter-get-fontify-buffer):
(jupyter-fixup-font-lock-properties):
(jupyter-add-font-lock-properties):
(jupyter-fontify-according-to-mode):
(jupyter-insert-html):
(jupyter-markdown-mouse-map):
(juputer-markdown-follow-link-at-point):
(jupyter-insert-markdown):
(jupyter-insert-latex):
(jupyter-insert-ansi-coded-text): Moved from jupyter-repl.el, replaced
`jupyter-repl-` prefix with `jupyter-`.
(jupyter--shr-put-image): Ditto. Also add `shr-` prefix.
(jupyter--delete-javascript-tags): Ditto. Also mark as private functions.
(jupyter-insert-image): Ditto. Also mark as a public function.
(jupyter-insert): (DISPLAY-ID ...) Moved from jupyter-repl.el. Was
`jupyter-repl-insert-data-with-id`.
(jupyter-with-control-code-handling):
(jupyter-markdown-follow-link): Moved from jupyter-repl.el
(jupyter-insert): Implement methods to do the work previously done by
`jupyter-repl-insert-data`.

* jupyter-repl.el (jupyter-repl-graphic-mimetypes): Moved to jupyter-base.el,
 inverted and renamed to `jupyter-nongraphic-mime-types`.
(jupyter-repl-graphic-data-p): Remove unused function.
(jupyter-repl-insert-data): Remove, replace calls with `jupyter-insert`.
(jupyter-repl-add-font-lock-properties):
(jupyter-repl-fixup-font-lock-properties):
(jupyter-repl-get-fontify-buffer):
(jupyter-repl-fontify-according-to-mode):
(jupyter-repl-delete-javascript-tags):
(jupyter-repl-put-image):
(jupyter-repl-insert-html):
(jupyter-repl-markdown-mouse-map):
(jupyter-repl-markdown-follow-link-at-point):
(jupyter-repl-insert-markdown):
(jupyter-repl-insert-latex):
(jupyter-repl--insert-image): Moved to jupyter-mime.el, which see.
(jupyter-repl-insert-data-with-id): Ditto. Changed to a `jupyter-insert` method
dispatched on a string argument.
(jupyter-repl-insert-ansi-coded-text): Ditto. Replace calls with
`jupyter-insert-ansi-coded-text`.
(jupyter-with-control-code-handling):
(jupyter-markdown-follow-link): Moved to jupyter-mime.el.

* jupyter-org-client.el (jupyter-handle-error): Replace
  `jupyter-repl-insert-ansi-coded-text` with `jupyter-insert-ansi-coded-text`.

* jupyter-tests.el (jupyter-insert): Add tests for `jupyter-insert`
2018-11-13 17:46:07 -06:00
Nathaniel Nicandro
dcd6e0fd25 Add jupyter-with-insertion-bounds
This function will prove useful in the future for applying text properties to
inserted text once the new `jupyter-insert` method is introduced.

* jupyter-base.el (jupyter-with-insertion-bounds): Add the new macro.

* jupyter-repl.el (jupyter-with-control-code-handling): Use it.
2018-11-10 08:41:13 -06:00
Nathaniel Nicandro
3241b47609 jupyter-repl-insert-html: Fix insertion of XHTML (#4)
Fixes #4. `shr` uses `libxml-parse-html-region` internally which converts all
tags and attributes to lowercase when constructing the DOM since HTML is
case-insensitive. But SVG uses XML which is a case-sensitive language. This
means that a conversion from the DOM back to an XML representation does not
restore the case of tags/attributes if `libxml-parse-html-region` is used. This
is solved by using `libxml-parse-xml-region` which preserves case.

* jupyter-repl.el (jupyter-repl-put-image): New function.
(jupyter-repl-insert-html): Temporarily bind libxml-parse-html-region to
libxml-parse-xml-region. Temporarily bind shr-put-image-function to
jupyter-repl-put-image.
2018-11-09 08:13:01 -06:00
Nathaniel Nicandro
4d4da4fcdc jupyter-repl-insert-data: Support image/jpeg
jupyter-repl.el (jupyter-repl-graphic-mimetypes): Add :image/jpeg.
(jupyter-repl-insert-data): Add the support.
2018-11-08 23:07:29 -06:00
Nathaniel Nicandro
fb55644d17 jupyter-repl-propertize-output: Also add text properties to ` character
For the Julia kernel.
2018-11-08 21:33:30 -06:00
Nathaniel Nicandro
7aac141275 jupyter-repl-connected-p: Simplify heartbeat check 2018-11-08 21:21:23 -06:00
Nathaniel Nicandro
22796ad4cd jupyter-client.el: Add jupyter-clients
* jupyter-client.el: Add the function

* jupyter-repl.el (jupyter-repl-available-repl-buffers): Use it. Ensure REPL
buffers are still live.
2018-11-08 21:15:22 -06:00
Nathaniel Nicandro
6a7a6aa4b3 jupyter-with-output-buffer: Properly initialize jupyter-output-buffer-marker 2018-11-07 12:54:15 -06:00
Nathaniel Nicandro
172f29b4fe jupyter-repl-propertize-output: Fix infinite loop
* If `comment-start` is nil, using a regular expression with an empty or clause
  causes an infinite loop. Ensure that we only add the or clause when
  `comment-start` is non-nil in `jupyter-repl-propertize-output`.

* Copy over the `comment-start` from the REPL language buffer in
  `jupyter-repl-initialize-fontification`
2018-11-07 12:20:33 -06:00
Nathaniel Nicandro
05bbe0414d Rename jupyter-startup-timeout to jupyter-long-timeout 2018-11-05 00:00:08 -06:00
Nathaniel Nicandro
50f797168d Add jupyter-repl-previous-cell-count 2018-11-04 23:56:42 -06:00
Nathaniel Nicandro
0fc402cd6b Add jupyter-repl-cell-reset-prompt 2018-11-04 23:56:42 -06:00
Nathaniel Nicandro
d86eea253b jupyter-handle-status: Force a mode line update after changing status 2018-11-04 23:56:42 -06:00
Nathaniel Nicandro
bd2333a432 Only consider the REPL buffer modified when editing an input cell 2018-11-04 23:56:42 -06:00
Nathaniel Nicandro
983ccf6ec7 Add jupyter-with-control-code-handling
This macro takes care of any ANSI control codes that the kernel output may
produce.
2018-11-04 23:56:42 -06:00
Nathaniel Nicandro
6c6712bb0a jupyter-with-output-buffer: Refactor
* Rename `jupyter-repl-output-buffer-marker` to `jupyter-output-buffer-marker`

* Rename `jupyter-repl-output-buffer-last-request-id` to
  `jupyter-output-buffer-request-id`

* Add `jupyter--reset-output-buffer-p` which returns non-nil if the current
  input buffer should be reset.

* Simplify the `jupyter-with-output-buffer` macro
2018-11-04 23:56:42 -06:00
Nathaniel Nicandro
4cfa8b19fc jupyter-repl-eval-string: Simplify conditional 2018-11-04 23:56:42 -06:00
Nathaniel Nicandro
28d4390a1f jupyter-repl-eval-string: Use jupyter-with-message-content 2018-11-04 17:05:44 -06:00
Nathaniel Nicandro
4f40b050df Simplify working with buffers to insert kernel output
* Rename `jupyter-repl-with-output-buffer` to `jupyter-with-output-buffer`.

* Replace uses of `jupyter-repl-with-doc-buffer` with
  `jupyter-with-output-buffer`. The difference between the two was that
  `jupyter-repl-with-doc-buffer` always reset the buffer before inserting new
  output.
2018-11-04 17:05:44 -06:00
Nathaniel Nicandro
55b5f680ec Enable undo in a REPL input cell 2018-11-02 09:14:29 -05:00
Nathaniel Nicandro
b4cdf9de0b jupyter-repl-propertize-output: Also suppress fontification of comments 2018-11-02 09:10:17 -05:00
Nathaniel Nicandro
58e1515e75 Fix beginning-of-buffer error 2018-11-01 21:12:59 -05:00
Nathaniel Nicandro
4f78ef34a2 Add jupyter-repl-insert-message
This function is essentially the same as `jupyter-repl-insert-data` but also
allows different kernel languages to do post-processing to the inserted data.

This is done by defining a new method, `jupyter-repl-after-insert-message`
which is called with the buffer narrowed to the inserted data.

One of its uses is to fontify documentation strings of Python kernels when
making inspect requests.
2018-10-31 18:49:37 -05:00
Nathaniel Nicandro
01be7be844 jupyter-inspect: Ensure the right client is used for `help-setup-xref' 2018-10-31 18:49:37 -05:00
Nathaniel Nicandro
589bfecdb0 jupyter-handle-display-data: Only inhibit redisplay if debug-on-error is nil 2018-10-27 22:16:54 -05:00
Nathaniel Nicandro
b1bbfd0e1a Move python specific traceback handling to jupyter-python.el 2018-10-27 22:16:54 -05:00
Nathaniel Nicandro
cc95092797 jupyter-handle-status: Don't error if a REPL cell is not found
This change is required because when evaluating code in other contexts than the
REPL, the convention is to set `jupyter-inhibit-handlers` to `(not :status)` so
that the `execution-state` can be updated for the mode-line construct.
2018-10-27 22:16:54 -05:00
Nathaniel Nicandro
23caa99670 jupyter-repl-insert-data: Remove code duplication when inserting images 2018-10-27 22:16:54 -05:00
Nathaniel Nicandro
890f5ab3cb Silence byte compiler
* Declare undeclared external functions

* Add ext: prefix to filename of external packages that may not be present on
  every system

* Remove `company-grab-symbol-cons` function declaration since this function is
  no longer used.
2018-10-27 22:16:54 -05:00
Nathaniel Nicandro
2f2ac53851 jupyter-repl-after-change: Mention that cl-call-next-method needs to be called 2018-10-27 22:16:54 -05:00
Nathaniel Nicandro
77aad6630c jupyter-repl-initialize-fontification: Fix string syntax in output
* Previously any odd number of quote characters in the output of a cell messes
  up fontification of the next input cell since it will consider the input as
  part of a string. I had mistakenly thought that changing the syntax of the
  quote characters when inserting cell output fixed the problem but did not
  realize that as a part of fontification, the region being fontified is
  unfontified first by `font-lock-unfontify-region` whose default
  `font-lock-default-unfontify-region` removes the `syntax-table` property if
  `font-lock-syntactic-keywords` is non-nil for a major mode which means the
  `syntax-table` property that we add in the cell output gets removed.

  * The solution is to add our own `syntax-propertize-function` which calls
    `jupyter-repl-propertize-output` when attempting to fontify a region that
    is not cell code and calls the REPL languages `syntax-propertize-function`
    if available.

* In `jupyter-repl-propertize-output`, also change the syntax of ' characters
2018-10-27 22:15:49 -05:00
Nathaniel Nicandro
a3f4cf5d70 jupyter-repl-with-output-buffer: Fix misspelled documentation 2018-10-25 23:59:47 -05:00
Nathaniel Nicandro
2f3f910598 Replace deprecated destructor method with jupyter-finalizer 2018-10-25 23:59:47 -05:00
Nathaniel Nicandro
a5a20cad04 Unmark REPL cell as busy in jupyter-handle-status
Since evaluation functions like `jupyter-repl-eval-string` inhibit handlers
except the status handler it makes more sense to do this in the status handler
as well.
2018-10-25 23:59:47 -05:00
Nathaniel Nicandro
795c9b2542 Add jupyter-load-file-code 2018-10-25 23:59:47 -05:00
Nathaniel Nicandro
7efea4d582 Add note about moving output insertion and inspection functions to jupyter-client.el 2018-10-25 23:59:47 -05:00
Nathaniel Nicandro
4949e7f3bc jupyter-repl-markdown-mouse-map: Add documentation 2018-10-25 23:59:47 -05:00
Nathaniel Nicandro
60eed5b773 jupyter-repl-eval-string: Better condition for when to show the traceback buffer 2018-10-25 23:59:46 -05:00
Nathaniel Nicandro
50d1f395f6 jupyter-completion--arg-extract-1: Fix documentation 2018-10-25 23:59:46 -05:00
Nathaniel Nicandro
e243b9f496 jupyter-repl-after-init: Fix documentation 2018-10-25 23:59:46 -05:00
Nathaniel Nicandro
2911ac34bf Add jupyter-repl-propertize-output
Currently this function changes the syntax of " characters in inserted output
so that they do not get recognized for syntactic fontification. Syntactic
fontification should only happen for cell code.
2018-10-25 23:59:46 -05:00
Nathaniel Nicandro
8b75a8b2e2 jupyter-repl-initialize-fontification: Refactor and update
* Move the setting of `parse-sexp-lookup-properties` to
  `jupyter-repl-initialize-fontification` from `jupyter-repl-mode`

* Use the language mode's `syntax-propertize-function`, but only propertize
  regions that contain cell code.
2018-10-25 23:59:46 -05:00
Nathaniel Nicandro
8896e88476 Move language support definitions to their own files
* Define `jupyter-load-language-support` which takes a client and loads the
  language support definitions of the client's kernel language.

* Call `jupyter-load-language-support` when initializing a REPL buffer in
  `jupyter-repl-mode`. Note this also takes care of loading the kernel support
  for a `jupyter-org-client' since a REPL buffer is setup before evaluating any
  `org-mode` source code blocks.

* Move language specific methods to their own files named `jupyter-LANGUAGE.el`
2018-10-25 23:59:46 -05:00
Nathaniel Nicandro
af6dc4e5f3 jupyter-repl-add-font-lock-properties: Remove improper use of font-lock-multiline 2018-10-25 23:59:46 -05:00
Nathaniel Nicandro
ecd6a3098b Move jupyter-eval from jupyter-repl.el to jupyter-client.el 2018-10-25 23:17:28 -05:00
Nathaniel Nicandro
ab44407fdf Add jupyter-completion-post-completion method
This way kernel languages can override the default behavior. The default
implementation expands the candidate snippet if one is available.
2018-10-25 23:17:28 -05:00
Nathaniel Nicandro
8ccd41fe89 jupyter-repl-display-kernel-buffer: Guard against a dead kernel 2018-10-25 23:17:28 -05:00
Nathaniel Nicandro
82a7031325 jupyter-repl-append-output: Explicitly disable jit-lock-mode
Sometimes when inserting output in the REPL buffer, JIT font-locking takes
place before we are able to add the text properties preventing it from running
on cell output. This happens, for example, when inserting HTML output in a
Haskell kernel. Since cell output should never be font-locked by the REPL
buffer, explicitly disable it when inserting output.
2018-10-25 23:17:28 -05:00