fix issue with deprecated .py.ipynb file extension

README.md

@@ -29,6 +29,10 @@ This is a Visual Studio Code extension that allows you to work with Azure Databr
 - Easy configuration via standard VS Code settings
 
 # Relase Notes
+**v0.5.2**:
+- fix issues with deprecated file extension '.py.ipynb'. Also removed it from configuration settings (but it still works)
+- reworked UseCodeCells to now use the code cell tags provided by Databricks instead of adding new ones
+- refresh on Connections Tab now also re-activates the current connection to reload the configuration
 **v0.5.1**:
 - fix issues with unsupported file extensions (e.g. .scala.ipynb)
 **v0.5.0**:

package.json

@@ -2,7 +2,7 @@
 	"name": "databricks-vscode",
 	"displayName": "Databricks VSCode",
 	"description": "Databricks Extension for VSCode",
-	"version": "0.5.1",
+	"version": "0.5.2",
 	"publisher": "paiqo",
 	"icon": "resources/databricks_extension.png",
 	"author": {
@@ -118,7 +118,6 @@
 														"type": "string",
 														"enum": [
 															".py",
-															".py.ipynb",
 															".ipynb"
 														],
 														"description": "The file extension used when downloading Python notebooks from Databricks."
@@ -215,7 +214,6 @@
 								"type": "string",
 								"enum": [
 									".py",
-									".py.ipynb",
 									".ipynb"
 								],
 								"description": "The file extension used when downloading Python notebooks from Databricks."
@@ -338,7 +336,6 @@
 											"type": "string",
 											"enum": [
 												".py",
-												".py.ipynb",
 												".ipynb"
 											],
 											"description": "The file extension used when downloading Python notebooks from Databricks."

src/DatabricksConnectionTreeProvider.ts

@@ -16,6 +16,7 @@ export class DatabricksConnectionTreeProvider implements vscode.TreeDataProvider
 			vscode.window.showInformationMessage('Refreshing Connections ...');
 		}
 		ThisExtension.ConnectionManager.loadConnections();
+		ThisExtension.ConnectionManager.activateConnection(ThisExtension.ActiveConnectionName);
 		this._onDidChangeTreeData.fire();
 	}
 

src/databricksApi/workspaces/DatabricksWorkspaceNotebook.ts

@@ -61,16 +61,28 @@ export class DatabricksWorkspaceNotebook extends DatabricksWorkspaceTreeItem {
 		}
 		if (!this.onlinePathExists && this.localPathExists) {
 			tooltip += "[Offline only]\n";
+			tooltip += "Local file extension: " + this.localFileExtension + "\n";
 		}
 		if (this.onlinePathExists && this.localPathExists) {
 			tooltip += "[Synced]\n";
+			tooltip += "Local file extension: " + this.localFileExtension + "\n";
 		}
 		return tooltip;
 	}
 
 	// description is show next to the label
 	get description(): string {
-		return "[" + this.language + "] - " + this.path;
+		let ret: string;
+
+		ret = "[" + this.language;
+
+		if (this._languageFileExtension.isNotebook) {
+			ret += ", Notebook";
+		}
+
+		ret += "] - " + this.path;
+
+		return ret;
 	}
 
 	// used in package.json to filter commands via viewItem == CANSTART
@@ -167,11 +179,6 @@ export class DatabricksWorkspaceNotebook extends DatabricksWorkspaceTreeItem {
 				vscode.commands.executeCommand("databricksWorkspace.refresh", false);
 			}
 
-			if (!this._languageFileExtension.isNotebook && ThisExtension.ActiveConnection.useCodeCells) {
-				ThisExtension.log("Adding Code Cells!");
-				Helper.addCodeCells(localPath);
-			}
-
 			return localPath;
 		}
 		catch (error) {
@@ -181,11 +188,6 @@ export class DatabricksWorkspaceNotebook extends DatabricksWorkspaceTreeItem {
 
 	async upload(): Promise<void> {
 		try {
-			if (!this._languageFileExtension.isNotebook && ThisExtension.ActiveConnection.useCodeCells) {
-				// 1. copy to temporary file
-				// 2. replace on temporary file using Helper.removeCodeCells(tempFilePath)
-				// 3. upload temp file
-			}
 			let response = DatabricksApiService.uploadWorkspaceItem(this.localFilePath, this.path, this.language, true, this.exportFormat);
 			vscode.window.showInformationMessage(`Upload of item ${this.path}) finished!`);
 

src/databricksApi/workspaces/LanguageFileExtensionMapper.ts

@@ -83,6 +83,7 @@ export class LanguageFileExtensionMapper {
 			case ".py":
 				ret._language = "PYTHON";
 				break;
+			case ".py.ipynb":
 			case ".ipynb":
 				ret._language = "PYTHON";
 				ret._isNotebook = true;
@@ -107,7 +108,11 @@ export class LanguageFileExtensionMapper {
 	}
 
 	static extensionFromFileName(fileName: string): string {
-		let tokens = fileName.split('.'); // e.g. '.py.ipynb'
+		if (fileName.endsWith(".py.ipynb")) {
+			return ".py.ipynb";
+		}
+
+		let tokens = fileName.split('.'); // e.g. '.ipynb' or '.scala'
 
 		return "." + tokens.slice(-1)[0];
 	}