Check global-whitespace-mode too, for margin calculation (#200)

alanz · yyoncho · commit fd68ee91b027 · 2018-12-05T22:47:00.000+02:00
diff --git a/lsp-ui-sideline.el b/lsp-ui-sideline.el
@@ -248,7 +248,9 @@ CURRENT is non-nil when the point is on the symbol."
      (if (bound-and-true-p display-line-numbers-mode)
          (+ 2 (line-number-display-width))
        0)
-     (if (bound-and-true-p whitespace-mode)
+     (if (or
+          (bound-and-true-p whitespace-mode)
+          (bound-and-true-p global-whitespace-mode))
          1
        0)))
 

Original file line number	Diff line number	Diff line change
`@@ -248,7 +248,9 @@ CURRENT is non-nil when the point is on the symbol."`
`248`	`248`	`(if (bound-and-true-p display-line-numbers-mode)`
`249`	`249`	`(+ 2 (line-number-display-width))`
`250`	`250`	`0)`
`251`		`- (if (bound-and-true-p whitespace-mode)`
	`251`	`+ (if (or`
	`252`	`+ (bound-and-true-p whitespace-mode)`
	`253`	`+ (bound-and-true-p global-whitespace-mode))`
`252`	`254`	`1`
`253`	`255`	`0)))`
`254`	`256`