Cut release v0.12.0 (#1069)

* Fit resolutions to less than 2k x 2k

* Integer resolutions

* Scale mouse clicks

* Move stream maxResolution logic to getDimensions

.eslintrc

@@ -11,6 +11,7 @@
       "semi": [
         "error",
         "never"
-      ]
+      ],
+      "react-hooks/exhaustive-deps": "off"
     }
 }

package.json

@@ -1,6 +1,6 @@
 {
   "name": "untitled-app",
-  "version": "0.11.3",
+  "version": "0.12.0",
   "private": true,
   "dependencies": {
     "@codemirror/autocomplete": "^6.10.2",
@@ -8,7 +8,7 @@
     "@fortawesome/free-brands-svg-icons": "^6.4.2",
     "@fortawesome/free-solid-svg-icons": "^6.4.2",
     "@fortawesome/react-fontawesome": "^0.2.0",
-    "@headlessui/react": "^1.7.13",
+    "@headlessui/react": "^1.7.17",
     "@headlessui/tailwindcss": "^0.2.0",
     "@kittycad/lib": "^0.0.45",
     "@lezer/javascript": "^1.4.7",
@@ -30,7 +30,7 @@
     "crypto-js": "^4.2.0",
     "debounce-promise": "^3.1.2",
     "formik": "^2.4.3",
-    "fuse.js": "^6.6.2",
+    "fuse.js": "^7.0.0",
     "http-server": "^14.1.1",
     "json-rpc-2.0": "^1.6.0",
     "re-resizable": "^6.9.11",
@@ -102,7 +102,7 @@
   },
   "devDependencies": {
     "@babel/plugin-proposal-private-property-in-object": "^7.21.11",
-    "@babel/preset-env": "^7.22.9",
+    "@babel/preset-env": "^7.23.3",
     "@tauri-apps/cli": "^1.5.6",
     "@types/crypto-js": "^4.1.1",
     "@types/debounce-promise": "^3.1.8",
@@ -111,18 +111,18 @@
     "@types/uuid": "^9.0.4",
     "@types/wicg-file-system-access": "^2020.9.6",
     "@types/ws": "^8.5.5",
-    "@vitejs/plugin-react": "^4.0.3",
+    "@vitejs/plugin-react": "^4.1.1",
     "@vitest/coverage-istanbul": "^0.34.1",
     "autoprefixer": "^10.4.13",
     "eslint": "^8.53.0",
     "eslint-config-react-app": "^7.0.1",
-    "eslint-plugin-css-modules": "^2.11.0",
+    "eslint-plugin-css-modules": "^2.12.0",
     "happy-dom": "^10.8.0",
     "husky": "^8.0.3",
     "postcss": "^8.4.31",
     "prettier": "^2.8.0",
     "setimmediate": "^1.0.5",
-    "tailwindcss": "^3.2.4",
+    "tailwindcss": "^3.3.5",
     "vite": "^4.5.0",
     "vite-plugin-eslint": "^1.8.1",
     "vite-tsconfig-paths": "^4.2.1",

src-tauri/Cargo.lock

@@ -1732,9 +1732,9 @@ checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646"
 
 [[package]]
 name = "libc"
-version = "0.2.148"
+version = "0.2.150"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9cdc71e17332e86d2e1d38c1f99edcb6288ee11b815fb1a4b049eaa2114d369b"
+checksum = "89d92a4743f9a61002fae18374ed11e7973f530cb3a3255fb354818118b2203c"
 
 [[package]]
 name = "libm"
@@ -1913,12 +1913,6 @@ version = "0.2.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a"
 
-[[package]]
-name = "minisign-verify"
-version = "0.2.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "933dca44d65cdd53b355d0b73d380a2ff5da71f87f036053188bf1eab6a19881"
-
 [[package]]
 name = "miniz_oxide"
 version = "0.6.2"
@@ -1940,9 +1934,9 @@ dependencies = [
 
 [[package]]
 name = "mio"
-version = "0.8.8"
+version = "0.8.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "927a765cd3fc26206e66b296465fa9d3e5ab003e651c1b3c060e7956d96b19d2"
+checksum = "3dce281c5e46beae905d4de1870d8b1509a9142b62eedf18b443b011ca8343d0"
 dependencies = [
  "libc",
  "wasi 0.11.0+wasi-snapshot-preview1",
@@ -3438,9 +3432,9 @@ dependencies = [
 
 [[package]]
 name = "socket2"
-version = "0.5.4"
+version = "0.5.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4031e820eb552adee9295814c0ced9e5cf38ddf1e8b7d566d6de8e2538ea989e"
+checksum = "7b5fac59a5cb5dd637972e5fca70daf0523c9067fcdc4842f053dae04a18f8e9"
 dependencies = [
  "libc",
  "windows-sys 0.48.0",
@@ -3745,7 +3739,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "9bfe673cf125ef364d6f56b15e8ce7537d9ca7e4dae1cf6fbbdeed2e024db3d9"
 dependencies = [
  "anyhow",
- "base64 0.21.2",
  "bytes",
  "cocoa",
  "dirs-next",
@@ -3759,7 +3752,6 @@ dependencies = [
  "heck 0.4.1",
  "http",
  "ignore",
- "minisign-verify",
  "objc",
  "once_cell",
  "open",
@@ -3784,14 +3776,12 @@ dependencies = [
  "tauri-utils",
  "tempfile",
  "thiserror",
- "time",
  "tokio",
  "url",
  "uuid",
  "webkit2gtk",
  "webview2-com",
  "windows 0.39.0",
- "zip",
 ]
 
 [[package]]
@@ -3856,7 +3846,7 @@ dependencies = [
 [[package]]
 name = "tauri-plugin-fs-extra"
 version = "0.0.0"
-source = "git+https://github.com/tauri-apps/plugins-workspace?branch=v1#6865299149ffd183365e3ff291acf3edac78ca61"
+source = "git+https://github.com/tauri-apps/plugins-workspace?branch=v1#61e862597e7234ddca9d9c4b07700855841888f3"
 dependencies = [
  "log",
  "serde",
@@ -4035,9 +4025,9 @@ checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20"
 
 [[package]]
 name = "tokio"
-version = "1.33.0"
+version = "1.34.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4f38200e3ef7995e5ef13baec2f432a6da0aa9ac495b2c0e8f3b7eec2c92d653"
+checksum = "d0c014766411e834f7af5b8f4cf46257aab4036ca95e9d2c144a10f59ad6f5b9"
 dependencies = [
  "backtrace",
  "bytes",
@@ -4045,7 +4035,7 @@ dependencies = [
  "mio",
  "num_cpus",
  "pin-project-lite",
- "socket2 0.5.4",
+ "socket2 0.5.5",
  "windows-sys 0.48.0",
 ]
 
@@ -5012,14 +5002,3 @@ checksum = "56c1936c4cc7a1c9ab21a1ebb602eb942ba868cbd44a99cb7cdc5892335e1c85"
 dependencies = [
  "linked-hash-map",
 ]
-
-[[package]]
-name = "zip"
-version = "0.6.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "760394e246e4c28189f19d488c058bf16f564016aefac5d32bb1f3b51d5e9261"
-dependencies = [
- "byteorder",
- "crc32fast",
- "crossbeam-utils",
-]

src-tauri/Cargo.toml

@@ -22,7 +22,7 @@ serde = { version = "1.0", features = ["derive"] }
 serde_json = "1.0"
 tauri = { version = "1.5.2", features = [ "os-all", "dialog-all", "fs-all", "http-request", "path-all", "shell-open", "shell-open-api", "updater", "devtools"] }
 tauri-plugin-fs-extra = { git = "https://github.com/tauri-apps/plugins-workspace", branch = "v1" }
-tokio = { version = "1.33.0", features = ["time"] }
+tokio = { version = "1.34.0", features = ["time"] }
 toml = "0.8.2"
 
 [features]

src-tauri/tauri.conf.json

@@ -8,7 +8,7 @@
   },
   "package": {
     "productName": "kittycad-modeling",
-    "version": "0.11.3"
+    "version": "0.12.0"
   },
   "tauri": {
     "allowlist": {

src/components/FileTree.tsx

@@ -9,7 +9,6 @@ import { FontAwesomeIcon } from '@fortawesome/react-fontawesome'
 import { faChevronRight, faTrashAlt } from '@fortawesome/free-solid-svg-icons'
 import { useFileContext } from 'hooks/useFileContext'
 import { useHotkeys } from 'react-hotkeys-hook'
-import { kclManager } from 'lang/KclSinglton'
 import styles from './FileTree.module.css'
 import { sortProject } from 'lib/tauriFS'
 

src/hooks/useSetupEngineManager.ts

@@ -82,9 +82,14 @@ export function useSetupEngineManager(
 }
 
 function getDimensions(streamWidth?: number, streamHeight?: number) {
+  const maxResolution = 2000
   const width = streamWidth ? streamWidth : 0
-  const quadWidth = Math.round(width / 4) * 4
   const height = streamHeight ? streamHeight : 0
-  const quadHeight = Math.round(height / 4) * 4
+  const ratio = Math.min(
+    Math.min(maxResolution / width, maxResolution / height),
+    1.0
+  )
+  const quadWidth = Math.round((width * ratio) / 4) * 4
+  const quadHeight = Math.round((height * ratio) / 4) * 4
   return { width: quadWidth, height: quadHeight }
 }

src/lang/std/engineConnection.ts

@@ -216,6 +216,26 @@ export class EngineConnection {
       }
     })
 
+    this.pc.addEventListener('icecandidateerror', (_event) => {
+      const event = _event as RTCPeerConnectionIceErrorEvent
+      console.error(
+        `ICE candidate returned an error: ${event.errorCode}: ${event.errorText} for ${event.url}`
+      )
+    })
+
+    this.pc.addEventListener('connectionstatechange', (event) => {
+      if (this.pc?.iceConnectionState === 'connected') {
+        if (this.shouldTrace()) {
+          iceSpan.resolve?.()
+        }
+      } else if (this.pc?.iceConnectionState === 'failed') {
+        // failed is a terminal state; let's explicitly kill the
+        // connection to the server at this point.
+        console.log('failed to negotiate ice connection; restarting')
+        this.close()
+      }
+    })
+
     this.websocket.addEventListener('open', (event) => {
       if (this.shouldTrace()) {
         websocketSpan.resolve?.()
@@ -351,19 +371,6 @@ export class EngineConnection {
         // until the end of this function is setup of our end of the
         // PeerConnection and waiting for events to fire our callbacks.
 
-        this.pc.addEventListener('connectionstatechange', (event) => {
-          if (this.pc?.iceConnectionState === 'connected') {
-            if (this.shouldTrace()) {
-              iceSpan.resolve?.()
-            }
-          } else if (this.pc?.iceConnectionState === 'failed') {
-            // failed is a terminal state; let's explicitly kill the
-            // connection to the server at this point.
-            console.log('failed to negotiate ice connection; restarting')
-            this.close()
-          }
-        })
-
         this.pc.addEventListener('icecandidate', (event) => {
           if (!this.pc || !this.websocket) return
           if (event.candidate !== null) {
@@ -633,7 +640,10 @@ export class EngineCommandManager {
 
     // If we already have an engine connection, just need to resize the stream.
     if (this.engineConnection) {
-      this.handleResize({ streamWidth: width, streamHeight: height })
+      this.handleResize({
+        streamWidth: width,
+        streamHeight: height,
+      })
       return
     }
 

src/wasm-lib/Cargo.lock

@@ -447,9 +447,9 @@ dependencies = [
 
 [[package]]
 name = "clap"
-version = "4.4.7"
+version = "4.4.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ac495e00dcec98c83465d5ad66c5c4fabd652fd6686e7c6269b117e729a6f17b"
+checksum = "2275f18819641850fa26c89acc84d465c1bf91ce57bc2748b28c420473352f64"
 dependencies = [
  "clap_builder",
  "clap_derive",
@@ -457,9 +457,9 @@ dependencies = [
 
 [[package]]
 name = "clap_builder"
-version = "4.4.7"
+version = "4.4.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c77ed9a32a62e6ca27175d00d29d05ca32e396ea1eb5fb01d8256b669cec7663"
+checksum = "07cdf1b148b25c1e1f7a42225e30a0d99a615cd4637eae7365548dd4529b95bc"
 dependencies = [
  "anstream",
  "anstyle",
@@ -1425,18 +1425,6 @@ dependencies = [
  "treediff",
 ]
 
-[[package]]
-name = "kcl-compile-macro"
-version = "0.1.0"
-dependencies = [
- "databake",
- "kcl-lib",
- "pretty_assertions",
- "proc-macro2",
- "quote",
- "syn 2.0.39",
-]
-
 [[package]]
 name = "kcl-lib"
 version = "0.1.35"
@@ -1475,6 +1463,18 @@ dependencies = [
  "winnow",
 ]
 
+[[package]]
+name = "kcl-macros"
+version = "0.1.0"
+dependencies = [
+ "databake",
+ "kcl-lib",
+ "pretty_assertions",
+ "proc-macro2",
+ "quote",
+ "syn 2.0.39",
+]
+
 [[package]]
 name = "kittycad"
 version = "0.2.41"
@@ -3139,9 +3139,9 @@ checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20"
 
 [[package]]
 name = "tokio"
-version = "1.33.0"
+version = "1.34.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4f38200e3ef7995e5ef13baec2f432a6da0aa9ac495b2c0e8f3b7eec2c92d653"
+checksum = "d0c014766411e834f7af5b8f4cf46257aab4036ca95e9d2c144a10f59ad6f5b9"
 dependencies = [
  "backtrace",
  "bytes",
@@ -3158,9 +3158,9 @@ dependencies = [
 
 [[package]]
 name = "tokio-macros"
-version = "2.1.0"
+version = "2.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "630bdcf245f78637c13ec01ffae6187cca34625e8c63150d424b59e55af2675e"
+checksum = "5b8a1e28f2deaa14e508979454cb3a223b10b938b45af148bc0986de36f1923b"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -3628,9 +3628,9 @@ dependencies = [
 
 [[package]]
 name = "wasm-bindgen-futures"
-version = "0.4.37"
+version = "0.4.38"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c02dbc21516f9f1f04f187958890d7e6026df8d16540b7ad9492bc34a67cea03"
+checksum = "9afec9963e3d0994cac82455b2b3502b81a7f40f9a0d32181f7528d9f4b43e02"
 dependencies = [
  "cfg-if",
  "futures-core",
@@ -3723,9 +3723,9 @@ dependencies = [
 
 [[package]]
 name = "web-sys"
-version = "0.3.64"
+version = "0.3.65"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9b85cbef8c220a6abc02aefd892dfc0fc23afb1c6a426316ec33253a3877249b"
+checksum = "5db499c5f66323272151db0e666cd34f78617522fb0c1604d31a27c50c206a85"
 dependencies = [
  "js-sys",
  "wasm-bindgen",

src/wasm-lib/Cargo.toml

@@ -17,7 +17,7 @@ kittycad = { workspace = true }
 serde_json = "1.0.108"
 uuid = { version = "1.5.0", features = ["v4", "js", "serde"] }
 wasm-bindgen = "0.2.88"
-wasm-bindgen-futures = "0.4.37"
+wasm-bindgen-futures = "0.4.38"
 
 [dev-dependencies]
 anyhow = "1"
@@ -25,7 +25,7 @@ image = "0.24.7"
 kittycad = { workspace = true, default-features = true }
 pretty_assertions = "1.4.0"
 reqwest = { version = "0.11.22", default-features = false }
-tokio = { version = "1.33.0", features = ["rt-multi-thread", "macros", "time"] }
+tokio = { version = "1.34.0", features = ["rt-multi-thread", "macros", "time"] }
 twenty-twenty = "0.6.1"
 uuid = { version = "1.5.0", features = ["v4", "js", "serde"] }
 
@@ -37,7 +37,7 @@ wasm-bindgen-futures = { version = "0.4.37", features = ["futures-core-03-stream
 wasm-streams = "0.4.0"
 
 [target.'cfg(target_arch = "wasm32")'.dependencies.web-sys]
-version = "0.3.57"
+version = "0.3.65"
 features = [
   "console",
   "HtmlTextAreaElement",
@@ -53,7 +53,7 @@ debug = true
 members = [
 	"derive-docs",
 	"kcl",
-  "kcl-compile-macro",
+  "kcl-macros",
 ]
 
 [workspace.dependencies]

src/wasm-lib/kcl-macros/Cargo.toml

@@ -1,5 +1,5 @@
 [package]
-name = "kcl-compile-macro"
+name = "kcl-macros"
 description = "Macro for compiling KCL to its AST during Rust compile-time"
 version = "0.1.0"
 edition = "2021"

src/wasm-lib/kcl-macros/src/lib.rs

@@ -12,7 +12,7 @@ use syn::{parse_macro_input, LitStr};
 /// let ast: kcl_lib::ast::types::Program = parse_kcl!("const y = 4");
 /// ```
 #[proc_macro]
-pub fn parse_kcl(input: TokenStream) -> TokenStream {
+pub fn parse(input: TokenStream) -> TokenStream {
     let input = parse_macro_input!(input as LitStr);
     let kcl_src = input.value();
     let tokens = kcl_lib::token::lexer(&kcl_src);

src/wasm-lib/kcl-macros/tests/macro_test.rs

@@ -1,14 +1,14 @@
 extern crate alloc;
-use kcl_compile_macro::parse_kcl;
 use kcl_lib::ast::types::{
     BodyItem, Identifier, Literal, LiteralValue, NonCodeMeta, Program, Value, VariableDeclaration, VariableDeclarator,
     VariableKind,
 };
+use kcl_macros::parse;
 use pretty_assertions::assert_eq;
 
 #[test]
 fn basic() {
-    let actual = parse_kcl!("const y = 4");
+    let actual = parse!("const y = 4");
     let expected = Program {
         start: 0,
         end: 11,

src/wasm-lib/kcl/Cargo.toml

@@ -13,7 +13,7 @@ rust-version = "1.73"
 anyhow = { version = "1.0.75", features = ["backtrace"] }
 async-recursion = "1.0.5"
 async-trait = "0.1.73"
-clap = { version = "4.4.7", features = ["cargo", "derive", "env", "unicode"], optional = true }
+clap = { version = "4.4.8", features = ["cargo", "derive", "env", "unicode"], optional = true }
 dashmap = "5.5.3"
 databake = { version = "0.1.6", features = ["derive"] }
 derive-docs = { version = "0.1.4" }
@@ -33,14 +33,14 @@ winnow = "0.5.18"
 js-sys = { version = "0.3.65" }
 tower-lsp = { version = "0.20.0", default-features = false, features = ["runtime-agnostic"] }
 wasm-bindgen = "0.2.88"
-wasm-bindgen-futures = "0.4.37"
-web-sys = { version = "0.3.64", features = ["console"] }
+wasm-bindgen-futures = "0.4.38"
+web-sys = { version = "0.3.65", features = ["console"] }
 
 [target.'cfg(not(target_arch = "wasm32"))'.dependencies]
 bson = { version = "2.7.0", features = ["uuid-1", "chrono"] }
 futures = { version = "0.3.29" }
 reqwest = { version = "0.11.22", default-features = false }
-tokio = { version = "1.33.0", features = ["full"] }
+tokio = { version = "1.34.0", features = ["full"] }
 tokio-tungstenite = { version = "0.20.0", features = ["rustls-tls-native-roots"] }
 tower-lsp = { version = "0.20.0", features = ["proposed"] }
 
@@ -62,7 +62,7 @@ expectorate = "1.1.0"
 insta = { version = "1.34.0", features = ["json"] }
 itertools = "0.11.0"
 pretty_assertions = "1.4.0"
-tokio = { version = "1.33.0", features = ["rt-multi-thread", "macros", "time"] }
+tokio = { version = "1.34.0", features = ["rt-multi-thread", "macros", "time"] }
 
 [[bench]]
 name = "compiler_benchmark"

src/wasm-lib/kcl/src/parser/parser_impl.rs

@@ -2801,5 +2801,4 @@ mod snapshot_tests {
     snapshot_test!(ar, r#"5 + "a""#);
     snapshot_test!(at, "line([0, l], %)");
     snapshot_test!(au, include_str!("../../../tests/executor/inputs/cylinder.kcl"));
-    snapshot_test!(av, "fn f = (angle) => { return default(angle, 360) }");
 }

src/wasm-lib/kcl/src/parser/snapshots/kcl_lib__parser__parser_impl__snapshot_tests__av.snap

@@ -1,94 +0,0 @@
----
-source: kcl/src/parser/parser_impl.rs
-expression: actual
----
-{
-  "start": 0,
-  "end": 48,
-  "body": [
-    {
-      "type": "VariableDeclaration",
-      "type": "VariableDeclaration",
-      "start": 0,
-      "end": 48,
-      "declarations": [
-        {
-          "type": "VariableDeclarator",
-          "start": 3,
-          "end": 48,
-          "id": {
-            "type": "Identifier",
-            "start": 3,
-            "end": 4,
-            "name": "f"
-          },
-          "init": {
-            "type": "FunctionExpression",
-            "type": "FunctionExpression",
-            "start": 7,
-            "end": 48,
-            "params": [
-              {
-                "type": "Identifier",
-                "start": 8,
-                "end": 13,
-                "name": "angle"
-              }
-            ],
-            "body": {
-              "start": 18,
-              "end": 48,
-              "body": [
-                {
-                  "type": "ReturnStatement",
-                  "type": "ReturnStatement",
-                  "start": 20,
-                  "end": 46,
-                  "argument": {
-                    "type": "CallExpression",
-                    "type": "CallExpression",
-                    "start": 27,
-                    "end": 46,
-                    "callee": {
-                      "type": "Identifier",
-                      "start": 27,
-                      "end": 34,
-                      "name": "default"
-                    },
-                    "arguments": [
-                      {
-                        "type": "Identifier",
-                        "type": "Identifier",
-                        "start": 35,
-                        "end": 40,
-                        "name": "angle"
-                      },
-                      {
-                        "type": "Literal",
-                        "type": "Literal",
-                        "start": 42,
-                        "end": 45,
-                        "value": 360,
-                        "raw": "360"
-                      }
-                    ],
-                    "optional": false
-                  }
-                }
-              ],
-              "nonCodeMeta": {
-                "nonCodeNodes": {},
-                "start": []
-              }
-            }
-          }
-        }
-      ],
-      "kind": "fn"
-    }
-  ],
-  "nonCodeMeta": {
-    "nonCodeNodes": {},
-    "start": []
-  }
-}

src/wasm-lib/kcl/src/token.rs

@@ -47,8 +47,6 @@ pub enum TokenType {
     Function,
     /// Unknown lexemes.
     Unknown,
-    /// The ? symbol, used for optional values.
-    QuestionMark,
 }
 
 /// Most KCL tokens correspond to LSP semantic tokens (but not all).
@@ -60,7 +58,6 @@ impl TryFrom<TokenType> for SemanticTokenType {
             TokenType::Word => Self::VARIABLE,
             TokenType::Keyword => Self::KEYWORD,
             TokenType::Operator => Self::OPERATOR,
-            TokenType::QuestionMark => Self::OPERATOR,
             TokenType::String => Self::STRING,
             TokenType::LineComment => Self::COMMENT,
             TokenType::BlockComment => Self::COMMENT,

src/wasm-lib/kcl/src/token/tokeniser.rs

@@ -21,7 +21,6 @@ pub fn token(i: &mut Located<&str>) -> PResult<Token> {
         '{' | '(' | '[' => brace_start,
         '}' | ')' | ']' => brace_end,
         ',' => comma,
-        '?' => question_mark,
         '0'..='9' => number,
         ':' => colon,
         '.' => alt((number, double_period, period)),
@@ -109,11 +108,6 @@ fn comma(i: &mut Located<&str>) -> PResult<Token> {
     Ok(Token::from_range(range, TokenType::Comma, value.to_string()))
 }
 
-fn question_mark(i: &mut Located<&str>) -> PResult<Token> {
-    let (value, range) = '?'.with_span().parse_next(i)?;
-    Ok(Token::from_range(range, TokenType::QuestionMark, value.to_string()))
-}
-
 fn colon(i: &mut Located<&str>) -> PResult<Token> {
     let (value, range) = ':'.with_span().parse_next(i)?;
     Ok(Token::from_range(range, TokenType::Colon, value.to_string()))