From 48316ed2005cc50f1f46733da1a425780d8802a4 Mon Sep 17 00:00:00 2001 From: Varun Gandhi Date: Fri, 8 Sep 2023 13:52:06 +0800 Subject: [PATCH] cleanup: Reset original workdir after change --- packages/pyright-scip/src/main-impl.ts | 7 +++++++ packages/pyright-scip/test/test-main.ts | 2 -- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/packages/pyright-scip/src/main-impl.ts b/packages/pyright-scip/src/main-impl.ts index 5b2c6fc76..68a93b3b2 100644 --- a/packages/pyright-scip/src/main-impl.ts +++ b/packages/pyright-scip/src/main-impl.ts @@ -20,6 +20,7 @@ function indexAction(options: IndexOptions): void { const snapshotDir = options.snapshotDir; const environment = options.environment; + const originalWorkdir = process.cwd(); process.chdir(projectRoot); const outputFile = path.join(projectRoot, options.output); @@ -44,6 +45,7 @@ function indexAction(options: IndexOptions): void { '\n\nExperienced Fatal Error While Indexing:\nPlease create an issue at github.com/sourcegraph/scip-python:', e ); + process.chdir(originalWorkdir); exit(1); } @@ -67,6 +69,8 @@ function indexAction(options: IndexOptions): void { writeSnapshot(outputPath, obtained); } } + + process.chdir(originalWorkdir); } function snapshotAction(snapshotRoot: string, options: SnapshotOptions): void { @@ -96,6 +100,7 @@ function snapshotAction(snapshotRoot: string, options: SnapshotOptions): void { } projectRoot = path.resolve(projectRoot); + const originalWorkdir = process.cwd(); process.chdir(projectRoot); const scipBinaryFile = path.join(projectRoot, options.output); @@ -135,6 +140,8 @@ function snapshotAction(snapshotRoot: string, options: SnapshotOptions): void { writeSnapshot(outputPath, obtained); } } + + process.chdir(originalWorkdir); } } diff --git a/packages/pyright-scip/test/test-main.ts b/packages/pyright-scip/test/test-main.ts index 4ee9ac83b..1b35ecb89 100644 --- a/packages/pyright-scip/test/test-main.ts +++ b/packages/pyright-scip/test/test-main.ts @@ -37,8 +37,6 @@ function testMain(mode: 'check' | 'update'): void { argv.push('--check'); } main(argv); - // main changes the working directory; reset it. - process.chdir(startCwd); } }