Merge branch 'develop' into collapsible
This commit is contained in:
commit
0ef2428c80
|
@ -149,7 +149,7 @@
|
||||||
},
|
},
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"vscode-languageclient": "^8.0.1",
|
"vscode-languageclient": "^8.0.1",
|
||||||
"vscode-languageserver": "^7.0.0",
|
"vscode-languageserver": "^8.0.1",
|
||||||
"vscode-languageserver-textdocument": "^1.0.5",
|
"vscode-languageserver-textdocument": "^1.0.5",
|
||||||
"@quri/squiggle-lang": "^0.2.11"
|
"@quri/squiggle-lang": "^0.2.11"
|
||||||
}
|
}
|
||||||
|
|
|
@ -36,11 +36,16 @@ function setHashData(data) {
|
||||||
}
|
}
|
||||||
|
|
||||||
export default function PlaygroundPage() {
|
export default function PlaygroundPage() {
|
||||||
|
const hashData = getHashData();
|
||||||
|
if (hashData.initialSquiggleString) {
|
||||||
|
hashData.defaultCode = String(hashData.initialSquiggleString);
|
||||||
|
delete hashData.initialSquiggleString;
|
||||||
|
}
|
||||||
const playgroundProps = {
|
const playgroundProps = {
|
||||||
defaultCode: "normal(0,1)",
|
defaultCode: "normal(0,1)",
|
||||||
height: 700,
|
height: 700,
|
||||||
showTypes: true,
|
showTypes: true,
|
||||||
...getHashData(),
|
...hashData,
|
||||||
onCodeChange: (code) => setHashData({ initialSquiggleString: code }),
|
onCodeChange: (code) => setHashData({ initialSquiggleString: code }),
|
||||||
onSettingsChange: (settings) => {
|
onSettingsChange: (settings) => {
|
||||||
const { showTypes, showControls, showSummary, showEditor } = settings;
|
const { showTypes, showControls, showSummary, showEditor } = settings;
|
||||||
|
|
28
yarn.lock
28
yarn.lock
|
@ -18059,11 +18059,6 @@ vsce-yarn-patch@^1.66.2:
|
||||||
yauzl "^2.3.1"
|
yauzl "^2.3.1"
|
||||||
yazl "^2.2.2"
|
yazl "^2.2.2"
|
||||||
|
|
||||||
vscode-jsonrpc@6.0.0:
|
|
||||||
version "6.0.0"
|
|
||||||
resolved "https://registry.yarnpkg.com/vscode-jsonrpc/-/vscode-jsonrpc-6.0.0.tgz#108bdb09b4400705176b957ceca9e0880e9b6d4e"
|
|
||||||
integrity sha512-wnJA4BnEjOSyFMvjZdpiOwhSq9uDoK8e/kpRJDTaMYzwlkrhG1fwDIZI94CLsLzlCK5cIbMMtFlJlfR57Lavmg==
|
|
||||||
|
|
||||||
vscode-jsonrpc@8.0.1:
|
vscode-jsonrpc@8.0.1:
|
||||||
version "8.0.1"
|
version "8.0.1"
|
||||||
resolved "https://registry.yarnpkg.com/vscode-jsonrpc/-/vscode-jsonrpc-8.0.1.tgz#f30b0625ebafa0fb3bc53e934ca47b706445e57e"
|
resolved "https://registry.yarnpkg.com/vscode-jsonrpc/-/vscode-jsonrpc-8.0.1.tgz#f30b0625ebafa0fb3bc53e934ca47b706445e57e"
|
||||||
|
@ -18078,14 +18073,6 @@ vscode-languageclient@^8.0.1:
|
||||||
semver "^7.3.5"
|
semver "^7.3.5"
|
||||||
vscode-languageserver-protocol "3.17.1"
|
vscode-languageserver-protocol "3.17.1"
|
||||||
|
|
||||||
vscode-languageserver-protocol@3.16.0:
|
|
||||||
version "3.16.0"
|
|
||||||
resolved "https://registry.yarnpkg.com/vscode-languageserver-protocol/-/vscode-languageserver-protocol-3.16.0.tgz#34135b61a9091db972188a07d337406a3cdbe821"
|
|
||||||
integrity sha512-sdeUoAawceQdgIfTI+sdcwkiK2KU+2cbEYA0agzM2uqaUy2UpnnGHtWTHVEtS0ES4zHU0eMFRGN+oQgDxlD66A==
|
|
||||||
dependencies:
|
|
||||||
vscode-jsonrpc "6.0.0"
|
|
||||||
vscode-languageserver-types "3.16.0"
|
|
||||||
|
|
||||||
vscode-languageserver-protocol@3.17.1:
|
vscode-languageserver-protocol@3.17.1:
|
||||||
version "3.17.1"
|
version "3.17.1"
|
||||||
resolved "https://registry.yarnpkg.com/vscode-languageserver-protocol/-/vscode-languageserver-protocol-3.17.1.tgz#e801762c304f740208b6c804a0cf21f2c87509ed"
|
resolved "https://registry.yarnpkg.com/vscode-languageserver-protocol/-/vscode-languageserver-protocol-3.17.1.tgz#e801762c304f740208b6c804a0cf21f2c87509ed"
|
||||||
|
@ -18099,22 +18086,17 @@ vscode-languageserver-textdocument@^1.0.5:
|
||||||
resolved "https://registry.yarnpkg.com/vscode-languageserver-textdocument/-/vscode-languageserver-textdocument-1.0.5.tgz#838769940ece626176ec5d5a2aa2d0aa69f5095c"
|
resolved "https://registry.yarnpkg.com/vscode-languageserver-textdocument/-/vscode-languageserver-textdocument-1.0.5.tgz#838769940ece626176ec5d5a2aa2d0aa69f5095c"
|
||||||
integrity sha512-1ah7zyQjKBudnMiHbZmxz5bYNM9KKZYz+5VQLj+yr8l+9w3g+WAhCkUkWbhMEdC5u0ub4Ndiye/fDyS8ghIKQg==
|
integrity sha512-1ah7zyQjKBudnMiHbZmxz5bYNM9KKZYz+5VQLj+yr8l+9w3g+WAhCkUkWbhMEdC5u0ub4Ndiye/fDyS8ghIKQg==
|
||||||
|
|
||||||
vscode-languageserver-types@3.16.0:
|
|
||||||
version "3.16.0"
|
|
||||||
resolved "https://registry.yarnpkg.com/vscode-languageserver-types/-/vscode-languageserver-types-3.16.0.tgz#ecf393fc121ec6974b2da3efb3155644c514e247"
|
|
||||||
integrity sha512-k8luDIWJWyenLc5ToFQQMaSrqCHiLwyKPHKPQZ5zz21vM+vIVUSvsRpcbiECH4WR88K2XZqc4ScRcZ7nk/jbeA==
|
|
||||||
|
|
||||||
vscode-languageserver-types@3.17.1:
|
vscode-languageserver-types@3.17.1:
|
||||||
version "3.17.1"
|
version "3.17.1"
|
||||||
resolved "https://registry.yarnpkg.com/vscode-languageserver-types/-/vscode-languageserver-types-3.17.1.tgz#c2d87fa7784f8cac389deb3ff1e2d9a7bef07e16"
|
resolved "https://registry.yarnpkg.com/vscode-languageserver-types/-/vscode-languageserver-types-3.17.1.tgz#c2d87fa7784f8cac389deb3ff1e2d9a7bef07e16"
|
||||||
integrity sha512-K3HqVRPElLZVVPtMeKlsyL9aK0GxGQpvtAUTfX4k7+iJ4mc1M+JM+zQwkgGy2LzY0f0IAafe8MKqIkJrxfGGjQ==
|
integrity sha512-K3HqVRPElLZVVPtMeKlsyL9aK0GxGQpvtAUTfX4k7+iJ4mc1M+JM+zQwkgGy2LzY0f0IAafe8MKqIkJrxfGGjQ==
|
||||||
|
|
||||||
vscode-languageserver@^7.0.0:
|
vscode-languageserver@^8.0.1:
|
||||||
version "7.0.0"
|
version "8.0.1"
|
||||||
resolved "https://registry.yarnpkg.com/vscode-languageserver/-/vscode-languageserver-7.0.0.tgz#49b068c87cfcca93a356969d20f5d9bdd501c6b0"
|
resolved "https://registry.yarnpkg.com/vscode-languageserver/-/vscode-languageserver-8.0.1.tgz#56bd7a01f5c88af075a77f1d220edcb30fc4bdc7"
|
||||||
integrity sha512-60HTx5ID+fLRcgdHfmz0LDZAXYEV68fzwG0JWwEPBode9NuMYTIxuYXPg4ngO8i8+Ou0lM7y6GzaYWbiDL0drw==
|
integrity sha512-sn7SjBwWm3OlmLtgg7jbM0wBULppyL60rj8K5HF0ny/MzN+GzPBX1kCvYdybhl7UW63V5V5tRVnyB8iwC73lSQ==
|
||||||
dependencies:
|
dependencies:
|
||||||
vscode-languageserver-protocol "3.16.0"
|
vscode-languageserver-protocol "3.17.1"
|
||||||
|
|
||||||
vscode-uri@^3.0.3:
|
vscode-uri@^3.0.3:
|
||||||
version "3.0.3"
|
version "3.0.3"
|
||||||
|
|
Loading…
Reference in New Issue
Block a user