 (symbol->string './assets/Pyret.png)))
+
+
+  (symbol->string './assets/pyret-logo.png)))
+
+
@@ -102,6 +113,27 @@
setTimeout(() => link.classList.remove('clicking'), 300);
});
});
+
+ // Mobile hamburger menu
+ const hamburgerBtn = document.getElementById('hamburger-btn');
+ const sidebarOverlay = document.getElementById('sidebar-overlay');
+ const sidebarCloseBtn = document.getElementById('sidebar-close-btn');
+ const sidebar = document.querySelector('.sidebar');
+
+ function openSidebar() {
+ sidebar.classList.add('sidebar-open');
+ sidebarOverlay.classList.add('active');
+ document.body.classList.add('sidebar-drawer-open');
+ }
+ function closeSidebar() {
+ sidebar.classList.remove('sidebar-open');
+ sidebarOverlay.classList.remove('active');
+ document.body.classList.remove('sidebar-drawer-open');
+ }
+
+ if (hamburgerBtn) hamburgerBtn.addEventListener('click', openSidebar);
+ if (sidebarCloseBtn) sidebarCloseBtn.addEventListener('click', closeSidebar);
+ if (sidebarOverlay) sidebarOverlay.addEventListener('click', closeSidebar);
diff --git a/npm/package-lock.json b/npm/package-lock.json
index be35b6b7f..4feed0f0c 100644
--- a/npm/package-lock.json
+++ b/npm/package-lock.json
@@ -1,12 +1,12 @@
{
"name": "pyret-npm",
- "version": "0.0.77",
+ "version": "0.0.90",
"lockfileVersion": 3,
"requires": true,
"packages": {
"": {
"name": "pyret-npm",
- "version": "0.0.77",
+ "version": "0.0.90",
"license": "Apache-2.0",
"dependencies": {
"ascii-table": "^0.0.9",
diff --git a/npm/package.json b/npm/package.json
index b5c3e4cce..c5e1352c6 100644
--- a/npm/package.json
+++ b/npm/package.json
@@ -1,6 +1,6 @@
{
"name": "pyret-npm",
- "version": "0.0.77",
+ "version": "0.0.90",
"description": "The CLI for the Pyret programming language",
"files": [
"pyret.js",
diff --git a/util/update-repos.sh b/util/update-repos.sh
new file mode 100755
index 000000000..4f5fc6e5f
--- /dev/null
+++ b/util/update-repos.sh
@@ -0,0 +1,59 @@
+#!/bin/zsh
+
+# For each subrepo branch, pulls in any new commits from the upstream remote.
+# Then merges any updated branches back into the current branch.
+
+typeset -A repos=(
+ ["embed"]="git@github.com:jpolitz/pyret-embed.git"
+ ["vscode"]="git@github.com:jpolitz/pyret-parley-vscode.git"
+ ["npm"]="git@github.com:brownplt/pyret-npm.git"
+ ["pyret.org"]="git@github.com:brownplt/pyret.org.git"
+ ["docs"]="git@github.com:brownplt/pyret-docs.git"
+ ["codemirror-mode"]="git@github.com:brownplt/pyret-codemirror-mode.git"
+ ["code.pyret.org"]="git@github.com:brownplt/code.pyret.org.git"
+ ["lang"]="git@github.com:brownplt/pyret-lang.git"
+)
+
+set -e
+
+start_branch=$(git rev-parse --abbrev-ref HEAD)
+updated=()
+
+# Return to the starting branch on exit (covers both success and error paths).
+# If a merge conflict left us in MERGING state, abort it first so checkout works.
+cleanup() {
+ local git_dir
+ git_dir=$(git rev-parse --git-dir 2>/dev/null) || return
+ if [[ -f "$git_dir/MERGE_HEAD" ]]; then
+ echo "Aborting in-progress merge..."
+ git merge --abort
+ fi
+ git checkout "$start_branch"
+}
+trap cleanup EXIT
+
+for branch in "${(@k)repos}"; do
+ upstream="${repos[$branch]}"
+ git checkout "$branch"
+ before=$(git rev-parse HEAD)
+
+ echo "==> Checking $branch ($upstream)"
+ git pull --no-ff "$upstream"
+
+ after=$(git rev-parse HEAD)
+ updated+=("$branch")
+done
+
+# Back to start before merging (trap will fire on EXIT but we do it explicitly
+# here so the merges happen on the right branch)
+trap - EXIT
+git checkout "$start_branch"
+
+echo ""
+echo "==> Merging updated branches: ${updated[*]}"
+for branch in "${updated[@]}"; do
+ git merge --no-ff "$branch" -m "Merge branch '$branch'"
+done
+
+echo ""
+echo "Done."
diff --git a/vscode/.vscode/launch.json b/vscode/.vscode/launch.json
new file mode 100644
index 000000000..bb95fd1d8
--- /dev/null
+++ b/vscode/.vscode/launch.json
@@ -0,0 +1,14 @@
+{
+ "version": "0.2.0",
+ "configurations": [
+ {
+ "name": "Run Extension",
+ "type": "extensionHost",
+ "request": "launch",
+ "runtimeExecutable": "${execPath}",
+ "args": ["--extensionDevelopmentPath=${workspaceRoot}"],
+ "outFiles": ["${workspaceFolder}/out/**/*.js"],
+ "preLaunchTask": "npm: compile"
+ }
+ ]
+}
diff --git a/vscode/README.dev.md b/vscode/README.dev.md
index eb52c6f99..579f18e34 100644
--- a/vscode/README.dev.md
+++ b/vscode/README.dev.md
@@ -1,10 +1,10 @@
-Borrows heavily from https://github.com/microsoft/vscode-extension-samples/tree/main/custom-editor-sample
+Borrows heavily from
To run, first you must symlink `build` to a the `build/` directory of
`code.pyret.org`. You can get one by cloning `code.pyret.org` elsewhere and
symlinking to it.
-Then:
+Then, to test the web extension (in a new `github.dev`-like browser environment):
```
npm i
@@ -12,6 +12,11 @@ npm run compile
npx vscode-test-web --browserType=chromium --extensionDevelopmentPath . ./sampleFiles/
```
+To test locally without the web extension (say, to test or debug a feature that
+is not yet properly supported on the web), the easiest way to do so is to
+1. Open up `src/extension.ts`, then
+2. Press F5 (or run `Debug: Start Debugging` from the Command Palette)
+
User settings for avoiding diff views using the fancy editor; put in
`.vscode/settings.json` (or set via the menu):
@@ -23,6 +28,6 @@ User settings for avoiding diff views using the fancy editor; put in
}
```
-(Courtesy of https://github.com/microsoft/vscode-discussions/discussions/799)
+(Courtesy of )
Grammar and language-configuration contributed by Seth Poulsen.
diff --git a/vscode/package-lock.json b/vscode/package-lock.json
index 641457fb2..fd5a8b47e 100644
--- a/vscode/package-lock.json
+++ b/vscode/package-lock.json
@@ -1,15 +1,16 @@
{
"name": "pyret-parley",
- "version": "0.42.40",
+ "version": "0.42.43",
"lockfileVersion": 3,
"requires": true,
"packages": {
"": {
"name": "pyret-parley",
- "version": "0.42.40",
+ "version": "0.42.43",
"license": "Apache-2.0",
"dependencies": {
- "mustache": "^4.2.0"
+ "mustache": "^4.2.0",
+ "vscode-languageclient": "^9.0.1"
},
"devDependencies": {
"@types/mustache": "^4.2.5",
@@ -3455,16 +3456,23 @@
"version": "1.0.2",
"resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.2.tgz",
"integrity": "sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==",
- "dev": true,
"license": "MIT"
},
"node_modules/bare-events": {
- "version": "2.5.4",
- "resolved": "https://registry.npmjs.org/bare-events/-/bare-events-2.5.4.tgz",
- "integrity": "sha512-+gFfDkR8pj4/TrWCGUGWmJIkBwuxPS5F+a5yWjOHQt2hHvNZd5YLzadjmDUtFmMM4y429bnKLa8bYBMHcYdnQA==",
+ "version": "2.8.2",
+ "resolved": "https://registry.npmjs.org/bare-events/-/bare-events-2.8.2.tgz",
+ "integrity": "sha512-riJjyv1/mHLIPX4RwiK+oW9/4c3TEUeORHKefKAKnZ5kyslbN+HXowtbaVEqt4IMUB7OXlfixcs6gsFeo/jhiQ==",
"dev": true,
"license": "Apache-2.0",
- "optional": true
+ "optional": true,
+ "peerDependencies": {
+ "bare-abort-controller": "*"
+ },
+ "peerDependenciesMeta": {
+ "bare-abort-controller": {
+ "optional": true
+ }
+ }
},
"node_modules/bare-fs": {
"version": "4.0.1",
@@ -3940,7 +3948,6 @@
"version": "2.0.1",
"resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.1.tgz",
"integrity": "sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA==",
- "dev": true,
"license": "MIT",
"dependencies": {
"balanced-match": "^1.0.0"
@@ -12812,7 +12819,6 @@
"version": "7.6.3",
"resolved": "https://registry.npmjs.org/semver/-/semver-7.6.3.tgz",
"integrity": "sha512-oVekP1cKtI+CTDvHWYFUcMtsK/00wmAEfyqKfNdARm8u1wNVhSgaX7A8d4UuIlUI5e84iEwOhs7ZPYRmzU9U6A==",
- "dev": true,
"license": "ISC",
"bin": {
"semver": "bin/semver.js"
@@ -15264,6 +15270,57 @@
"url": "https://github.com/sponsors/sindresorhus"
}
},
+ "node_modules/vscode-jsonrpc": {
+ "version": "8.2.0",
+ "resolved": "https://registry.npmjs.org/vscode-jsonrpc/-/vscode-jsonrpc-8.2.0.tgz",
+ "integrity": "sha512-C+r0eKJUIfiDIfwJhria30+TYWPtuHJXHtI7J0YlOmKAo7ogxP20T0zxB7HZQIFhIyvoBPwWskjxrvAtfjyZfA==",
+ "license": "MIT",
+ "engines": {
+ "node": ">=14.0.0"
+ }
+ },
+ "node_modules/vscode-languageclient": {
+ "version": "9.0.1",
+ "resolved": "https://registry.npmjs.org/vscode-languageclient/-/vscode-languageclient-9.0.1.tgz",
+ "integrity": "sha512-JZiimVdvimEuHh5olxhxkht09m3JzUGwggb5eRUkzzJhZ2KjCN0nh55VfiED9oez9DyF8/fz1g1iBV3h+0Z2EA==",
+ "license": "MIT",
+ "dependencies": {
+ "minimatch": "^5.1.0",
+ "semver": "^7.3.7",
+ "vscode-languageserver-protocol": "3.17.5"
+ },
+ "engines": {
+ "vscode": "^1.82.0"
+ }
+ },
+ "node_modules/vscode-languageclient/node_modules/minimatch": {
+ "version": "5.1.6",
+ "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-5.1.6.tgz",
+ "integrity": "sha512-lKwV/1brpG6mBUFHtb7NUmtABCb2WZZmm2wNiOA5hAb8VdCS4B3dtMWyvcoViccwAW/COERjXLt0zP1zXUN26g==",
+ "license": "ISC",
+ "dependencies": {
+ "brace-expansion": "^2.0.1"
+ },
+ "engines": {
+ "node": ">=10"
+ }
+ },
+ "node_modules/vscode-languageserver-protocol": {
+ "version": "3.17.5",
+ "resolved": "https://registry.npmjs.org/vscode-languageserver-protocol/-/vscode-languageserver-protocol-3.17.5.tgz",
+ "integrity": "sha512-mb1bvRJN8SVznADSGWM9u/b07H7Ecg0I3OgXDuLdn307rl/J3A9YD6/eYOssqhecL27hK1IPZAsaqh00i/Jljg==",
+ "license": "MIT",
+ "dependencies": {
+ "vscode-jsonrpc": "8.2.0",
+ "vscode-languageserver-types": "3.17.5"
+ }
+ },
+ "node_modules/vscode-languageserver-types": {
+ "version": "3.17.5",
+ "resolved": "https://registry.npmjs.org/vscode-languageserver-types/-/vscode-languageserver-types-3.17.5.tgz",
+ "integrity": "sha512-Ld1VelNuX9pdF39h2Hgaeb5hEZM2Z3jUrrMgWQAu82jMtZp7p3vJT3BzToKtZI7NgQssZje5o0zryOrhQvzQAg==",
+ "license": "MIT"
+ },
"node_modules/vscode-uri": {
"version": "3.0.8",
"resolved": "https://registry.npmjs.org/vscode-uri/-/vscode-uri-3.0.8.tgz",
diff --git a/vscode/package.json b/vscode/package.json
index e4def3a66..4402cb3be 100644
--- a/vscode/package.json
+++ b/vscode/package.json
@@ -3,7 +3,7 @@
"displayName": "Pyret Interactive Editor for VSCode",
"description": "An interactive Pyret mode",
"icon": "media/pyret-logo-128.png",
- "version": "0.42.40",
+ "version": "0.42.43",
"publisher": "PyretProgrammingLanguage",
"private": true,
"license": "Apache-2.0",
@@ -22,6 +22,7 @@
"syntaxes/pyret.tmLanguage.json"
],
"browser": "./dist/web/extension.js",
+ "main": "./dist/extension.js",
"contributes": {
"languages": [
{
@@ -118,7 +119,14 @@
"Load `url-file()` imports from the local filesystem if they exist, otherwise from the URL"
],
"description": "Controls how `url-file()` imports are resolved"
- }
+ },
+ "pyret.trace.server": {
+ "type": "string",
+ "enum": ["off", "messages", "verbose"],
+ "default": "verbose",
+ "scope": "resource",
+ "description": "Traces logs of the communication between VS Code and the language server."
+ }
}
}
},
@@ -147,6 +155,7 @@
"yo": "^5.1.0"
},
"dependencies": {
- "mustache": "^4.2.0"
+ "mustache": "^4.2.0",
+ "vscode-languageclient": "^9.0.1"
}
}
diff --git a/vscode/src/extension.ts b/vscode/src/extension.ts
new file mode 100644
index 000000000..438e89272
--- /dev/null
+++ b/vscode/src/extension.ts
@@ -0,0 +1,67 @@
+import * as vscode from "vscode";
+import * as path from "path";
+import { PyretCPOWebProvider, makeCommandHandler } from "./pyretCPOWebEditor";
+import {
+ LanguageClient,
+ LanguageClientOptions,
+ ServerOptions,
+ TransportKind,
+} from "vscode-languageclient/node";
+
+let client: LanguageClient;
+
+export function activate(context: vscode.ExtensionContext) {
+ context.subscriptions.push(PyretCPOWebProvider.register(context));
+ context.subscriptions.push(
+ vscode.commands.registerCommand(
+ "pyret-parley.run-file",
+ makeCommandHandler(context),
+ ),
+ );
+
+ const serverModule = context.asAbsolutePath(
+ path.join("..", "lsp", "out", "server-node-tmp.js"),
+ );
+ const debugOptions = { execArgv: ["--nolazy", "--inspect=6009"] };
+ const outputChannel = vscode.window.createOutputChannel(
+ "Pyret Server",
+ );
+ const traceOutputChannel = vscode.window.createOutputChannel(
+ "Pyret Language Server",
+ );
+
+ const serverOptions: ServerOptions = {
+ run: { module: serverModule, transport: TransportKind.ipc },
+ debug: {
+ module: serverModule,
+ transport: TransportKind.ipc,
+ options: debugOptions,
+ },
+ };
+
+ const clientOptions: LanguageClientOptions = {
+ documentSelector: [{ scheme: "file", language: "pyret" }],
+ synchronize: {
+ fileEvents: vscode.workspace.createFileSystemWatcher("**/*.arr"),
+ },
+ outputChannel: outputChannel,
+ traceOutputChannel: traceOutputChannel,
+ };
+
+ client = new LanguageClient(
+ "pyret",
+ "Pyret Language Server",
+ serverOptions,
+ clientOptions,
+ );
+
+ client.start();
+ outputChannel.appendLine("Pyret Language Server started");
+}
+
+export function deactivate(): Thenable | undefined {
+ if (!client) {
+ return undefined;
+ }
+ return client.stop();
+}
diff --git a/vscode/src/webExtension.ts b/vscode/src/webExtension.ts
index 34dd42554..bd73e9cdb 100644
--- a/vscode/src/webExtension.ts
+++ b/vscode/src/webExtension.ts
@@ -5,4 +5,4 @@ export function activate(context: vscode.ExtensionContext) {
// Register our custom editor providers
context.subscriptions.push(PyretCPOWebProvider.register(context));
context.subscriptions.push(vscode.commands.registerCommand("pyret-parley.run-file", makeCommandHandler(context)));
-}
\ No newline at end of file
+}
diff --git a/vscode/webpack.config.js b/vscode/webpack.config.js
index 9893296ff..dd706f861 100644
--- a/vscode/webpack.config.js
+++ b/vscode/webpack.config.js
@@ -87,4 +87,47 @@ const webExtensionConfig = {
},
};
-module.exports = [ webExtensionConfig ];
\ No newline at end of file
+/** @type WebpackConfig */
+const nodeExtensionConfig = {
+ mode: 'none',
+ target: 'node', // extensions run in a Node.js context
+ entry: {
+ 'extension': './src/extension.ts'
+ },
+ output: {
+ filename: '[name].js',
+ path: path.join(__dirname, './dist'),
+ libraryTarget: 'commonjs2',
+ devtoolModuleFilenameTemplate: '../[resource-path]'
+ },
+ resolve: {
+ mainFields: ['main', 'module'],
+ extensions: ['.ts', '.js'],
+ },
+ module: {
+ rules: [{
+ test: /\.ts$/,
+ exclude: /node_modules/,
+ use: [{
+ loader: 'ts-loader'
+ }]
+ },
+ {
+ test: /\.html/,
+ type: 'asset/source'
+ }
+ ]
+ },
+ externals: {
+ 'vscode': 'commonjs vscode',
+ },
+ performance: {
+ hints: false
+ },
+ devtool: 'nosources-source-map',
+ infrastructureLogging: {
+ level: "log",
+ },
+};
+
+module.exports = [ webExtensionConfig, nodeExtensionConfig ];
\ No newline at end of file