[Insiders] Throwing error when a file is edited and saved from a diff view

[stagefright5]

• Version: 1.57.0-insider (user setup)
• Commit: 659175f
• Date: 2021-05-13T05:13:18.296Z
• Electron: 12.0.4
• Chrome: 89.0.4389.114
• Node.js: 14.16.0
• V8: 8.9.255.24-electron.0
• OS: Windows_NT x64 10.0.1904

Steps to Reproduce:

1. Open a git project
2. Edit a file
3. Open the diff editor from the git extension view
4. Edit the file
5. Save

Additional Context

I have both the insiders and stable installed and I enabled the settings sync.

Toggle the settings content (It is huge)

{
    "editor.fontFamily": "'Iosevka SS05', 'Iosevka Type Curly Slab', 'Cousine', 'Fira Code', 'Rec Mono Duotone', 'Operator Mono', 'Source Code Pro', 'Fantasque Sans Mono', 'Gintronic', 'Fira Code iScript','Courier New', 'Menlo', monospace, FiraFlott, Firicico",
    "editor.fontLigatures": true,
    // "editor.fontLigatures": "'ss01', 'ss02', 'ss03', 'ss05', 'ss06', 'ss07', 'zero'",
	// "editor.fontLigatures": "'ss01', 'ss02', 'ss03', 'ss04', 'ss05', 'ss06', 'zero', 'onum'"
	"python.insidersChannel": "off",
	"terminal.integrated.shell.windows": "C:\\WINDOWS\\System32\\WindowsPowerShell\\v1.0\\powershell.exe",
    "workbench.sideBar.location": "right",
    "todo-tree.tree.showScanModeButton": false,
    "workbench.editor.enablePreview": false,
    "workbench.editor.enablePreviewFromQuickOpen": false,
	"search.useReplacePreview": false,
    "editor.cursorStyle": "block",
	"terminal.integrated.fontFamily": "'Cascadia Mono PL', 'Operator Mono'",
    "window.zoomLevel": 0,
    "workbench.colorCustomizations": {
        "[Ayu Dark Bordered]": {
            "editor.background": "#191924"
        },
        "[Noctis Minimus]": {
            "editor.background": "#17232b"
        },
        "[One Dark Pro]": {
			"editor.background": "#292b30",
			"tab.activeBackground": "#292b30",
			"terminal.background": "#292b30",
			
			"panel.background": "#21252b",
			"tab.inactiveBackground": "#21252b",

			"tab.inactiveForeground": "#636363",
		},
		"[Zenburn]": {
			"menu.background": "#252525",
			"breadcrumbPicker.background": "#252525",
			"tab.inactiveBackground": "#252525",
			"editorGutter.background": "#252525",
			"panel.background": "#252525",

			"menu.selectionBackground": "#3f3f3f",
			"editor.lineHighlightBackground": "#3f3f3f",
			"editorLineNumber.foreground": "#3f3f3f",

			"editor.background": "#363131",
			"tab.activeBackground": "#363131",
			"breadcrumb.background": "#363131",
			"statusBar.background": "#363131",

			"editorLineNumber.activeForeground": "#636363",
			"breadcrumb.foreground": "#636363",
			"tab.inactiveForeground": "#636363",
			"statusBar.foreground": "#636363",

			"editorCursor.foreground": "#ffffef",

			"editor.selectionBackground": "#616161",
			
			"sideBar.background": "#2B2B2B",
			"statusBar.noFolderBackground": "#2B2B2B",
			"statusBar.debuggingBackground": "#2B2B2B",
		
			"scrollbar.shadow": "#00000000",
			"widget.shadow": "#00000000",

			"statusBar.noFolderBorder": "#a8a8a8",

			"statusBar.debuggingBorder": "#DC8CC3",
		}
	},
	"yaml.schemas": {
		"file:///c%3A/Users/sanka/.vscode-insiders/extensions/atlassian.atlascode-2.8.6/resources/schemas/pipelines-schema.json": "bitbucket-pipelines.yml"
	},
	"atlascode.jira.jqlList": [
		{
			"id": "b8c17b00-c0fa-4ac9-861b-53feafd493ee",
			"enabled": false,
			"name": "My jatahworx Issues",
			"query": "assignee = currentUser() AND resolution = Unresolved ORDER BY lastViewed DESC",
			"siteId": "55591ef9-d3ce-4a25-887b-e4e7a5a863c8",
			"monitor": true
		},
		{
			"id": "ba9354cd-a581-41e1-b0b6-ffe57b0763f9",
			"siteId": "55591ef9-d3ce-4a25-887b-e4e7a5a863c8",
			"filterId": "10408",
			"name": "My Open Issues in Open Sprints ",
			"query": "Sprint in openSprints() AND assignee = currentUser() AND status not in (Done, Closed, Canceled, Cancelled, Resolved, Declined, \"Unable to Replicate\") ORDER BY priority DESC",
			"enabled": true,
			"monitor": true
		},
		{
			"id": "8c38844f-333e-4fb1-a2b3-e88fdda0f674",
			"siteId": "55591ef9-d3ce-4a25-887b-e4e7a5a863c8",
			"filterId": "10409",
			"name": "All My Valid Issues In Open Sprints",
			"query": "project in (Supernova, Studio, STARGAZER) AND Sprint in openSprints() AND assignee = currentUser() AND status not in (Canceled, Cancelled, Declined)",
			"enabled": true,
			"monitor": true
		},
		{
			"id": "550e746f-4d39-47d0-972c-f8e1f35c8d04",
			"siteId": "55591ef9-d3ce-4a25-887b-e4e7a5a863c8",
			"filterId": "10411",
			"name": "My Done Issues In Open Sprints",
			"query": "Sprint in openSprints() AND assignee = currentUser() AND status in (Done) ORDER BY cf[10258] DESC",
			"enabled": true,
			"monitor": true
		}
	],
	"atlascode.jira.lastCreateSiteAndProject": {
		"siteId": "55591ef9-d3ce-4a25-887b-e4e7a5a863c8",
		"projectKey": "AC"
	},
	"git.branchSortOrder": "alphabetically",
	"diffEditor.renderSideBySide": true,
	"gitlens.views.repositories.files.layout": "list",
	"gitlens.views.compare.files.layout": "list",
	"[typescript]": {
		"editor.defaultFormatter": "esbenp.prettier-vscode"
	},
	"javascript.format.insertSpaceAfterOpeningAndBeforeClosingEmptyBraces": false,
	"typescript.format.insertSpaceAfterOpeningAndBeforeClosingEmptyBraces": false,
	"editor.maxTokenizationLineLength": 100000,
	"editor.formatOnSaveMode": "modifications",
	"debug.console.fontSize": 12.5,
	"terminal.integrated.fontSize": 12.5,
	"salesforcedx-vscode-apex.java.home": "C:\\Program Files\\Java\\jdk1.8.0_251",
	"gitlens.advanced.telemetry.enabled": false,
	"gruvboxMaterial.darkCursor": "red",
	"gruvboxMaterial.italicKeywords": true,
	"[html]": {
		"editor.defaultFormatter": "esbenp.prettier-vscode"
	},
	"[json]": {
		"editor.defaultFormatter": "vscode.json-language-features"
	},
	"[javascript]": {
		"editor.defaultFormatter": "esbenp.prettier-vscode"
	},
	// Causes the debug view to automatically appear when a breakpoint is hit. This
	// setting is global and not configurable per-language.
	"debug.openDebug": "openOnDebugBreak",

	"[dart]": {
		"editor.formatOnSave": true,
		"editor.formatOnType": true,
		"editor.rulers": [
			120
		],
		"editor.selectionHighlight": false,
		"editor.suggest.snippetsPreventQuickSuggestions": false,
		"editor.suggestSelection": "first",
		"editor.tabCompletion": "onlySnippets",
		"editor.wordBasedSuggestions": false
	},
	"timeline.excludeSources": [],
	"salesforcedx-vscode-core.telemetry.enabled": false,
	"editor.suggestSelection": "first",
	"vsintellicode.modify.editor.suggestSelection": "automaticallyOverrodeDefaultValue",
	"git.autofetch": true,
	"vscode-neovim.neovimExecutablePaths.win32": "C:\\Program Files\\Neovim\\bin\\nvim.exe",
	"vscode-neovim.revealCursorScrollLine": true,
	"zeplin.preferredApplicationType": "App",
	"explorer.confirmDelete": false,
	"[jsonc]": {
		"editor.defaultFormatter": "esbenp.prettier-vscode"
	},
	"editor.wordBasedSuggestionsMode": "allDocuments",
	"[xml]": {
		"editor.defaultFormatter": "DotJoshJohnson.xml"
	},
	"json.maxItemsComputed": 10000,
	"gitlens.views.searchAndCompare.files.layout": "list",
	"html.hover.references": false,
	"gitlens.views.branches.branches.layout": "list",
	"gitlens.views.remotes.branches.layout": "list",
	"workbench.iconTheme": "Monokai Pro (Filter Spectrum) Icons",
	"codesnap.realLineNumbers": true,
	"codesnap.showWindowTitle": true,
	"codesnap.showWindowControls": false,
	"atlascode.jira.explorer.refreshInterval": 5,
	"atlascode.bitbucket.explorer.refreshInterval": 5,
	"workbench.tree.expandMode": "singleClick",
	"window.menuBarVisibility": "toggle",
	"gruvboxMaterial.darkContrast": "hard",
	"editor.cursorBlinking": "solid",
	"themeshift.nighttheme": "Dracula",
	"themeshift.sunrise": "06:30",
	"themeshift.sunset": "18:45",
	"themeshift.daytheme": "Quiet Light",
	"workbench.productIconTheme": "icons-carbon",
	"editor.stickyTabStops": true,
	"angular.experimental-ivy": true,
	"terminal.integrated.rendererType": "dom",
	"todo-tree.regex.regex": "(//|#|<!--|;|/\\*|^|^\\s*(-|\\d+.))\\s*($TAGS)",
	"todo-tree.general.tags": [
			"BUG",
			"HACK",
			"FIXME",
			"TODO",
			"XXX",
			"[ ]",
			"[x]"
		],
		"git.fetchOnPull": true,
		"prettier.useEditorConfig": false,
		"todo-tree.tree.buttons.scanMode": true,
		"todo-tree.tree.showCountsInTree": true,
		"debug.console.fontFamily": "'Cascadia Mono PL'",
		"scm.inputFontFamily": "editor",
		"editor.inlineHints.fontFamily": "editor",
		"atlascode.jira.todoIssues.enabled": false,
		"atlascode.jira.startWorkBranchTemplate.customTemplate": "{{{prefix}}}{{{summary}}}-{{{issueKey}}}",
		"atlascode.jira.startWorkBranchTemplate.customPrefixes": [
			"issue",
			"feature"
		],
		"atlascode.jira.statusbar.enabled": false,
		"atlascode.bitbucket.statusbar.enabled": false,
		"atlascode.bitbucket.issues.createJiraEnabled": true,
		"gitlens.views.commits.files.layout": "list",
		"gitlens.views.repositories.includeWorkingTree": true,
		"gitlens.views.repositories.branches.layout": "list",
		"gitlens.views.branches.files.layout": "list",
		"gitlens.views.remotes.files.layout": "list",
		"gitlens.views.stashes.files.layout": "list",
		"gitlens.mode.active": "review",
		"prettier.tabWidth": 4,
		"editor.fontSize": 13,
		"editor.mouseWheelScrollSensitivity": 3,
		"C_Cpp.updateChannel": "Insiders",
		"[markdown]": {
			"editor.defaultFormatter": "yzhang.markdown-all-in-one"
		},
		"editor.linkedEditing": true,
		"workbench.editorAssociations": {
			"*.ipynb": "jupyter-notebook"
		},
		"python.condaPath": "C:\\Users\\sanka\\miniconda2\\condabin",
		"workbench.tree.renderIndentGuides": "always",
		"terminal.integrated.showTabs": false,
		"editor.gotoLocation.alternativeImplementationCommand": "editor.action.goToReferences",
		"typescript.implementationsCodeLens.enabled": true,
		"[scss]": {
			"editor.defaultFormatter": "esbenp.prettier-vscode"
		},
		"window.dialogStyle": "custom",
		"workbench.experimental.useCustomHover": true,
		"editor.minimap.enabled": false,
		"terminal.integrated.tabs.enabled": false,
		"prettier.singleQuote": true,
		"workbench.colorTheme": "Monokai Pro (Filter Spectrum)"
	// "editor.tokenColorCustomizations": {
	// 	"textMateRules": [
	// 		// {
	// 		//     "scope": "emphasis",
	// 		//     "settings": {
	// 		//         "fontStyle": "italic"
	// 		//     }
	// 		// },
	// 		// {
	// 		//     "scope": "strong",
	// 		//     "settings": {
	// 		//         "fontStyle": "bold"
	// 		//     }
	// 		// },
	// 		// {
	// 		//     "scope": [
	// 		//         "entity.other.attribute-name",
	// 		//         "entity.name.function",
	// 		//         "entity.name.method",
	// 		//     ]
	// 		//     "settings": {
	// 		//         "fontStyle": "italic"
	// 		//     }
	// 		// },
	// 		// {
	// 		//     "scope": "markup.underline",
	// 		//     "settings": {
	// 		//         "fontStyle": "underline"
	// 		//     }
	// 		// },
	// 		// {
	// 		//     "scope": "markup.bold",
	// 		//     "settings": {
	// 		//         "fontStyle": "bold"
	// 		//     }
	// 		// },
	// 		// {
	// 		//     "scope": "markup.heading",
	// 		//     "settings": {
	// 		//         "fontStyle": "bold"
	// 		//     }
	// 		// },
	// 		// {
	// 		//     "scope": "markup.italic",
	// 		//     "settings": {
	// 		//         "fontStyle": "italic"
	// 		//     }
	// 		// },
	// 		// {
	// 		//     "scope": "storage.type",
	// 		//     "settings": {
	// 		//         "fontStyle": "italic"
	// 		//     }
	// 		// },
	// 		// {
	// 		//     "scope": "storage.modifier",
	// 		//     "settings": {
	// 		//         "fontStyle": "italic"
	// 		//     }
	// 		// },
	// 		// {
	// 		//     "name": "String interpolation",
	// 		//     "scope": [
	// 		//         "punctuation.definition.template-expression.begin",
	// 		//         "punctuation.definition.template-expression.end",
	// 		//         "punctuation.section.embedded"
	// 		//     ],
	// 		//     "settings": {
	// 		//         "fontStyle": "italic"
	// 		//     }
	// 		// },
	// 		// {
	// 		//     "scope": "keyword.control",
	// 		//     "settings": {
	// 		//         "fontStyle": "italic"
	// 		//     }
	// 		// },
	// 		// {
	// 		//     "scope": [
	// 		//         "keyword.operator.new",
	// 		//         "keyword.operator.expression",
	// 		//         "keyword.operator.cast",
	// 		//         "keyword.operator.sizeof",
	// 		//         "keyword.operator.logical.python"
	// 		//     ],
	// 		//     "settings": {
	// 		//         "fontStyle": "italic"
	// 		//     }
	// 		// },
	// 		// {
	// 		//     "name": "this.self",
	// 		//     "scope": "variable.language",
	// 		//     "settings": {
	// 		//         "fontStyle": "italic"
	// 		//     }
	// 		// },
	// 		{
	// 			"name": "@Decorator",
	// 			"scope": [
	// 				"meta.decorator punctuation.decorator"
	// 			],
	// 			"settings": {
	// 				"fontStyle": "italic"
	// 			}
	// 		},
	// 		// {
	// 		//     "scope": [
	// 		//         "punctuation.definition.comment",
	// 		//         "comment"
	// 		//     ],
	// 		//     "settings": {
	// 		//         "fontStyle": "italic"
	// 		//     }
	// 		// }
	// 		// {
	// 		//     "scope": [
	// 		//         "variable.language.this"
	// 		//     ],
	// 		//     "settings": {
	// 		//         "fontStyle": "italic"
	// 		//     }
	// 		// },
	// 		{
	// 			"name": "fontStyleNone",
	// 			"scope": [
	// 				//following will be in italic
	// 				"keyword", // import, export, return…
	// 				"constant", // String, Number, Boolean…, this, super
	// 				"keyword.operator",
	// 				"storage.modifier", // static keyword
	// 				// "storage.type.interface", //interface keyword
	// 				"storage.type", //class keyword
	// 				"entity.other.attribute-name",
	// 				//following will be excluded from italics (VSCode has some defaults for italics) Observable
	// 				"invalid",
	// 				// "keyword.operator",
	// 				"constant.numeric.css",
	// 				"keyword.other.unit.px.css",
	// 				"constant.numeric.decimal.js",
	// 				"constant.numeric.json",
	// 				// "entity.name.function", // function names
	// 			],
	// 			"settings": {
	// 				"fontStyle": ""
	// 			}
	// 		},
	// 		{
	// 			"name": "fontStyleIBU",
	// 			"scope": [
	// 				"entity.name.type.class", //class names
	// 				"entity.name.type",
	// 				"support.type.primitive"
	// 			],
	// 			"settings": {
	// 				"fontStyle": "italic bold underline",
	// 			}
	// 		},
	// 		{
	// 			"name": "fontStyleI",
	// 			"scope": [
	// 				"comment",
	// 				"support.function",
	// 				"meta.function-call",
	// 				"entity.name.function.member",
	// 				"variable.other.property",
	// 				"variable.other.object.property"
	// 			],
	// 			"settings": {
	// 				"fontStyle": "italic"
	// 			}
	// 		},
	// 		{
	// 			"name": "fontStyleIB",
	// 			"scope": [
	// 				"variable.language.this",
	// 			],
	// 			"settings": {
	// 				"fontStyle": "italic bold"
	// 			}
	// 		},
	// 		{
	// 			"name": "fontStyleB",
	// 			"scope": [
	// 				"keyword.operator.new"
	// 			],
	// 			"settings": {
	// 				"fontStyle": "bold"
	// 			}
	// 		}
	// 	]
	// },
}

Bug Video:

angular-tour-of-heroes.-.Visual.Studio.Code.-.Insiders.2021-05-13.13-52-06.mp4

Does this issue occur when all extensions are disabled?: Yes

[vscode-triage-bot]

This bug has been fixed in the latest release of VS Code Insiders!

@stagefright5, you can help us out by commenting /verified if things are now working as expected.

If things still don't seem right, please ensure you're on version a9c5e37 of Insiders (today's or later - you can use Help: About in the command palette to check), and leave a comment letting us know what isn't working as expected.

Happy Coding!

[stagefright5]

/verified