Merge from vscode c58aaab8a1cc22a7139b761166a0d4f37d41e998 (#7880)

* Merge from vscode c58aaab8a1cc22a7139b761166a0d4f37d41e998

* fix pipelines

* fix strict-null-checks

* add missing files

src/vs/editor/common/editorCommon.ts

@@ -315,6 +315,12 @@ export interface IEditor {
 	 */
 	getVisibleColumnFromPosition(position: IPosition): number;
 
+	/**
+	 * Given a position, returns a column number that takes tab-widths into account.
+	 * @internal
+	 */
+	getStatusbarColumn(position: IPosition): number;
+
 	/**
 	 * Returns the primary position of the cursor.
 	 */
@@ -488,10 +494,6 @@ export interface IDiffEditor extends IEditor {
  * An editor contribution that gets created every time a new editor gets created and gets disposed when the editor gets disposed.
  */
 export interface IEditorContribution {
-	/**
-	 * Get a unique identifier for this contribution.
-	 */
-	getId(): string;
 	/**
 	 * Dispose this contribution.
 	 */
@@ -506,6 +508,17 @@ export interface IEditorContribution {
 	restoreViewState?(state: any): void;
 }
 
+/**
+ * A diff editor contribution that gets created every time a new  diffeditor gets created and gets disposed when the diff editor gets disposed.
+ * @internal
+ */
+export interface IDiffEditorContribution {
+	/**
+	 * Dispose this contribution.
+	 */
+	dispose(): void;
+}
+
 /**
  * @internal
  */