Fixes microsoft#44940

alexdima · alexdima · commit c26adc191646 · 2018-05-02T18:02:53.000+02:00
diff --git a/src/vs/editor/browser/controller/mouseTarget.ts b/src/vs/editor/browser/controller/mouseTarget.ts
@@ -28,6 +28,7 @@ export interface IViewZoneData {
 
 export interface IMarginData {
 	isAfterLines: boolean;
+	glyphMarginLeft: number;
 	glyphMarginWidth: number;
 	lineNumbersWidth: number;
 	offsetX: number;
@@ -602,6 +603,7 @@ export class MouseTargetFactory {
 			let offset = Math.abs(request.pos.x - request.editorPos.x);
 			const detail: IMarginData = {
 				isAfterLines: res.isAfterLines,
+				glyphMarginLeft: ctx.layoutInfo.glyphMarginLeft,
 				glyphMarginWidth: ctx.layoutInfo.glyphMarginWidth,
 				lineNumbersWidth: ctx.layoutInfo.lineNumbersWidth,
 				offsetX: offset
diff --git a/src/vs/editor/contrib/folding/folding.ts b/src/vs/editor/contrib/folding/folding.ts
@@ -298,7 +298,7 @@ export class FoldingController implements IEditorContribution {
 		switch (e.target.type) {
 			case MouseTargetType.GUTTER_LINE_DECORATIONS:
 				const data = e.target.detail as IMarginData;
-				const gutterOffsetX = data.offsetX - data.glyphMarginWidth - data.lineNumbersWidth;
+				const gutterOffsetX = data.offsetX - data.glyphMarginWidth - data.lineNumbersWidth - data.glyphMarginLeft;
 
 				// TODO@joao TODO@alex TODO@martin this is such that we don't collide with dirty diff
 				if (gutterOffsetX <= 10) {
diff --git a/src/vs/workbench/parts/scm/electron-browser/dirtydiffDecorator.ts b/src/vs/workbench/parts/scm/electron-browser/dirtydiffDecorator.ts
@@ -705,7 +705,7 @@ export class DirtyDiffController implements IEditorContribution {
 		}
 
 		const data = e.target.detail as IMarginData;
-		const gutterOffsetX = data.offsetX - data.glyphMarginWidth - data.lineNumbersWidth;
+		const gutterOffsetX = data.offsetX - data.glyphMarginWidth - data.lineNumbersWidth - data.glyphMarginLeft;
 
 		// TODO@joao TODO@alex TODO@martin this is such that we don't collide with folding
 		if (gutterOffsetX > 10) {

Original file line number	Diff line number	Diff line change
`@@ -705,7 +705,7 @@ export class DirtyDiffController implements IEditorContribution {`
`705`	`705`	`}`
`706`	`706`
`707`	`707`	`const data = e.target.detail as IMarginData;`
`708`		`- const gutterOffsetX = data.offsetX - data.glyphMarginWidth - data.lineNumbersWidth;`
	`708`	`+ const gutterOffsetX = data.offsetX - data.glyphMarginWidth - data.lineNumbersWidth - data.glyphMarginLeft;`
`709`	`709`
`710`	`710`	`// TODO@joao TODO@alex TODO@martin this is such that we don't collide with folding`
`711`	`711`	`if (gutterOffsetX > 10) {`