Dev/ianhu/add directory change to new export commands (#4151)

* tests and hygiene * new entry * remove comment * add directory change * add news
microsoft · Jan 28, 2019 · 3190d6f · 3190d6f
1 parent 7ce203d
commit 3190d6f
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 2 deletions.
diff --git a/news/2 Fixes/4140.md b/news/2 Fixes/4140.md
@@ -0,0 +1 @@
+Have the new export commands use our directory change code
diff --git a/src/client/datascience/historycommandlistener.ts b/src/client/datascience/historycommandlistener.ts
@@ -134,7 +134,13 @@ export class HistoryCommandListener implements IDataScienceCommandListener {
 
                     await this.waitForStatus(async () => {
                         if (uri) {
-                            const notebook = await this.jupyterExporter.translateToNotebook(cells);
+                            let directoryChange;
+                            const settings = this.configuration.getSettings();
+                            if (settings.datascience.changeDirOnImportExport) {
+                                directoryChange = uri.fsPath;
+                            }
+
+                            const notebook = await this.jupyterExporter.translateToNotebook(cells, directoryChange);
                             await this.fileSystem.writeFile(uri.fsPath, JSON.stringify(notebook));
                         }
                     }, localize.DataScience.exportingFormat(), file);
@@ -218,7 +224,12 @@ export class HistoryCommandListener implements IDataScienceCommandListener {
                 })));
 
             // Then save them to the file
-            const notebook = await this.jupyterExporter.translateToNotebook(cells);
+            let directoryChange;
+            if (settings.datascience.changeDirOnImportExport) {
+                directoryChange = file;
+            }
+
+            const notebook = await this.jupyterExporter.translateToNotebook(cells, directoryChange);
             await this.fileSystem.writeFile(file, JSON.stringify(notebook));
 
         } finally {
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		Have the new export commands use our directory change code