Revert "Fix for formatting notebook cells. (microsoft#17650)"

This reverts commit 1311770.

Author: kimadeline

news/2 Fixes/16980.md

@@ -248,13 +248,11 @@ export async function getTempFileWithDocumentContents(document: TextDocument, fs
     // because the language server is watching the file system for Python
     // file add/delete/change and we don't want this temp file to trigger it.
 
-    let fileName = `${document.uri.fsPath}.${md5(document.uri.fsPath + document.uri.fragment)}.tmp`;
+    let fileName = `${document.uri.fsPath}.${md5(document.uri.fsPath)}.tmp`;
     try {
         // When dealing with untitled notebooks, there's no original physical file, hence create a temp file.
         if (isNotebookCell(document.uri) && !(await fs.fileExists(document.uri.fsPath))) {
-            fileName = (
-                await fs.createTemporaryFile(`${path.basename(document.uri.fsPath)}-${document.uri.fragment}.tmp`)
-            ).filePath;
+            fileName = (await fs.createTemporaryFile(`${path.basename(document.uri.fsPath)}.tmp`)).filePath;
         }
         await fs.writeFile(fileName, document.getText());
     } catch (ex) {

src/client/common/editor.ts

@@ -3,7 +3,6 @@
 
 import * as vscode from 'vscode';
 import { ICommandManager, IDocumentManager, IWorkspaceService } from '../common/application/types';
-import { PYTHON_LANGUAGE } from '../common/constants';
 import { IConfigurationService } from '../common/types';
 import { IInterpreterService } from '../interpreter/contracts';
 import { IServiceContainer } from '../ioc/types';
@@ -77,7 +76,7 @@ export class PythonFormattingEditProvider
         // Workaround is to resolve promise to nothing here, then execute format document and force new save.
         // However, we need to know if this is 'format document' or formatting on save.
 
-        if (this.saving || document.languageId !== PYTHON_LANGUAGE) {
+        if (this.saving) {
             // We are saving after formatting (see onSaveDocument below)
             // so we do not want to format again.
             return [];