switch to smol-toml for toml parsing to fix crash when `pyproject.tom…

…l` contains emojis
DetachHead · Oct 28, 2024 · c1f0c20 · c1f0c20
1 parent a9ee22f
commit c1f0c20
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 100 deletions.
diff --git a/packages/pyright-internal/package-lock.json b/packages/pyright-internal/package-lock.json
diff --git a/packages/pyright-internal/package.json b/packages/pyright-internal/package.json
@@ -26,10 +26,10 @@
         "chokidar": "^3.6.0",
         "command-line-args": "^5.2.1",
         "diff": "^7.0.0",
-        "js-toml": "^1.0.0",
         "jsonc-parser": "^3.3.1",
         "leven": "3.1.0",
         "pyright-to-gitlab-ci": "^0.1.3",
+        "smol-toml": "^1.3.0",
         "source-map-support": "^0.5.21",
         "tmp": "^0.2.3",
         "vscode-jsonrpc": "^9.0.0-next.5",

diff --git a/packages/pyright-internal/src/analyzer/service.ts b/packages/pyright-internal/src/analyzer/service.ts
@@ -8,7 +8,7 @@
  * Python files.
  */
 
-import * as TOML from 'js-toml';
+import { parse } from 'smol-toml';
 import * as JSONC from 'jsonc-parser';
 import { AbstractCancellationTokenSource, CancellationToken } from 'vscode-languageserver';
 
@@ -1172,7 +1172,7 @@ export class AnalyzerService {
     private _parsePyprojectTomlFile(pyprojectPath: Uri): object | undefined {
         return this._attemptParseFile(pyprojectPath, (fileContents, attemptCount) => {
             try {
-                const configObj = TOML.load(fileContents);
+                const configObj = parse(fileContents);
                 if (configObj && 'tool' in configObj) {
                     const toml = configObj.tool as Record<string, object>;
                     if (toml.basedpyright && toml.pyright) {