Skip to content

Commit

Permalink
fix is_complete for magics, and add babel-runtime
Browse files Browse the repository at this point in the history
  • Loading branch information
jaredly committed Mar 26, 2017
1 parent dc04dfb commit 5710ae0
Show file tree
Hide file tree
Showing 4 changed files with 28 additions and 17 deletions.
1 change: 1 addition & 0 deletions .gitattributes
@@ -0,0 +1 @@
yarn.lock -diff
13 changes: 9 additions & 4 deletions lib/kernel.js
Expand Up @@ -105,10 +105,15 @@ export default class Kernel {

checkIsComplete(uuids, header, metadata, content) {
let isComplete = true
try {
new vm.Script(content.code)
} catch (e) {
isComplete = false
if (content.code[0] !== '%') { // not magic
try {
new vm.Script(content.code)
} catch (e) {
isComplete = false
}
} else if (content.code.slice(0, 2) === '%%') {
// multiline
isComplete = content.code.match(/\n$/) // must end in blank newline
}
this.send('shell', uuids, 'is_complete_reply', {
status: isComplete ? 'complete' : 'incomplete',
Expand Down
1 change: 1 addition & 0 deletions package.json
Expand Up @@ -28,6 +28,7 @@
"dependencies": {
"async": "^0.9.0",
"babel": "^5.1.11",
"babel-runtime": "^6.23.0",
"bencode": "^0.7.0",
"coffee-script": "^1.9.2",
"mkdirp": "^0.5.1",
Expand Down
30 changes: 17 additions & 13 deletions yarn.lock
Expand Up @@ -235,6 +235,13 @@ babel-plugin-undefined-to-void@^1.1.6:
version "1.1.6"
resolved "https://registry.yarnpkg.com/babel-plugin-undefined-to-void/-/babel-plugin-undefined-to-void-1.1.6.tgz#7f578ef8b78dfae6003385d8417a61eda06e2f81"

babel-runtime@^6.23.0:
version "6.23.0"
resolved "https://registry.yarnpkg.com/babel-runtime/-/babel-runtime-6.23.0.tgz#0a9489f144de70efb3ce4300accdb329e2fc543b"
dependencies:
core-js "^2.4.0"
regenerator-runtime "^0.10.0"

babel@^5.1.11:
version "5.8.38"
resolved "https://registry.yarnpkg.com/babel/-/babel-5.8.38.tgz#dfb087c22894917c576fb67ce9cf328d458629fb"
Expand Down Expand Up @@ -274,7 +281,7 @@ binary-extensions@^1.0.0:
version "1.8.0"
resolved "https://registry.yarnpkg.com/binary-extensions/-/binary-extensions-1.8.0.tgz#48ec8d16df4377eae5fa5884682480af4d95c774"

bindings@^1.2.1, bindings@~1.2.1:
bindings@~1.2.1:
version "1.2.1"
resolved "https://registry.yarnpkg.com/bindings/-/bindings-1.2.1.tgz#14ad6113812d2d37d72e67b4cacb4bb726505f11"

Expand Down Expand Up @@ -411,13 +418,6 @@ console-control-strings@^1.0.0, console-control-strings@~1.1.0:
version "1.1.0"
resolved "https://registry.yarnpkg.com/console-control-strings/-/console-control-strings-1.1.0.tgz#3d7cf4464db6446ea644bf4b39507f9851008e8e"

contextify@^0.1.13:
version "0.1.15"
resolved "https://registry.yarnpkg.com/contextify/-/contextify-0.1.15.tgz#3d34681d14a5ccbbe609c9ee11eda206b8cf266f"
dependencies:
bindings "^1.2.1"
nan "^2.1.0"

convert-source-map@^1.1.0:
version "1.3.0"
resolved "https://registry.yarnpkg.com/convert-source-map/-/convert-source-map-1.3.0.tgz#e9f3e9c6e2728efc2676696a70eb382f73106a67"
Expand All @@ -430,6 +430,10 @@ core-js@^1.0.0:
version "1.2.7"
resolved "https://registry.yarnpkg.com/core-js/-/core-js-1.2.7.tgz#652294c14651db28fa93bd2d5ff2983a4f08c636"

core-js@^2.4.0:
version "2.4.1"
resolved "https://registry.yarnpkg.com/core-js/-/core-js-2.4.1.tgz#4de911e667b0eae9124e34254b53aea6fc618d3e"

core-util-is@~1.0.0:
version "1.0.2"
resolved "https://registry.yarnpkg.com/core-util-is/-/core-util-is-1.0.2.tgz#b5fd54220aa2bc5ab57aab7140c940754503c1a7"
Expand Down Expand Up @@ -1031,11 +1035,7 @@ ms@0.7.2:
version "0.7.2"
resolved "https://registry.yarnpkg.com/ms/-/ms-0.7.2.tgz#ae25cf2512b3885a1d95d7f037868d8431124765"

nan@^2.1.0, nan@^2.3.0:
version "2.5.1"
resolved "https://registry.yarnpkg.com/nan/-/nan-2.5.1.tgz#d5b01691253326a97a2bbee9e61c55d8d60351e2"

nan@~2.3.0:
nan@^2.3.0, nan@~2.3.0:
version "2.3.5"
resolved "https://registry.yarnpkg.com/nan/-/nan-2.3.5.tgz#822a0dc266290ce4cd3a12282ca3e7e364668a08"

Expand Down Expand Up @@ -1260,6 +1260,10 @@ regenerate@^1.2.1:
version "1.3.2"
resolved "https://registry.yarnpkg.com/regenerate/-/regenerate-1.3.2.tgz#d1941c67bad437e1be76433add5b385f95b19260"

regenerator-runtime@^0.10.0:
version "0.10.3"
resolved "https://registry.yarnpkg.com/regenerator-runtime/-/regenerator-runtime-0.10.3.tgz#8c4367a904b51ea62a908ac310bf99ff90a82a3e"

regenerator@0.8.40:
version "0.8.40"
resolved "https://registry.yarnpkg.com/regenerator/-/regenerator-0.8.40.tgz#a0e457c58ebdbae575c9f8cd75127e93756435d8"
Expand Down

0 comments on commit 5710ae0

Please sign in to comment.