diff --git a/src/sql/azdata.d.ts b/src/sql/azdata.d.ts
index 1837c020a5..ab80381cd9 100644
--- a/src/sql/azdata.d.ts
+++ b/src/sql/azdata.d.ts
@@ -2699,7 +2699,7 @@ declare module 'azdata' {
 		radioButton(): ComponentBuilder<RadioButtonComponent, RadioButtonProperties>;
 		webView(): ComponentBuilder<WebViewComponent, WebViewProperties>;
 		editor(): ComponentBuilder<EditorComponent, EditorProperties>;
-		diffeditor(): ComponentBuilder<DiffEditorComponent, DiffEditorComponent>;
+		diffeditor(): ComponentBuilder<DiffEditorComponent, DiffEditorProperties>;
 		text(): ComponentBuilder<TextComponent, TextComponentProperties>;
 		image(): ComponentBuilder<ImageComponent, ImageComponentProperties>;
 		button(): ComponentBuilder<ButtonComponent, ButtonProperties>;
@@ -2749,7 +2749,7 @@ declare module 'azdata' {
 		/**
 		 * @deprecated Use withProps instead
 		 */
-		withProperties<U>(properties: U): ComponentBuilder<TComponent, TPropertyBag>;
+		withProperties(properties: TPropertyBag): ComponentBuilder<TComponent, TPropertyBag>;
 		/**
 		 * Sets the initial set of properties for the component being created
 		 * @param properties The properties to apply to the component
@@ -3959,23 +3959,39 @@ declare module 'azdata' {
 		readonly onEditorCreated: vscode.Event<any>;
 	}
 
-	export interface DiffEditorComponent extends Component {
+	export interface DiffEditorProperties extends ComponentProperties {
 		/**
 		 * Title of editor
 		 */
 		title: string;
+
 		/**
 		 * The content inside the left text editor
 		 */
 		contentLeft: string;
+
 		/**
 		 * The content inside the right text editor
 		 */
 		contentRight: string;
+
 		/**
 		 * The language mode for this text editor. The language mode is SQL by default.
 		 */
-		languageMode: string;
+		languageMode?: string;
+
+		/**
+		 * Toggle for whether the editor should be automatically resized or not
+		 */
+		isAutoResizable?: boolean;
+
+		/**
+		 * Minimum height for editor component
+		 */
+		minimumHeight?: number;
+	}
+	export interface DiffEditorComponent extends DiffEditorProperties, Component {
+
 		/**
 		 * The left editor Uri which will be used as a reference for VSCode Language Service.
 		 * Currently this is auto-generated by the framework but can be queried after
@@ -3997,16 +4013,6 @@ declare module 'azdata' {
 		 * An event called when the editor is created
 		 */
 		readonly onEditorCreated: vscode.Event<any>;
-
-		/**
-		 * Toggle for whether the editor should be automatically resized or not
-		 */
-		isAutoResizable: boolean;
-
-		/**
-		 * Minimum height for editor component
-		 */
-		minimumHeight: number;
 	}
 
 	export interface ButtonComponent extends ComponentWithIcon, ButtonProperties {