Replace text cursor styles with mouse-text class

kdrag0n · kdrag0n · commit 87e43131262f · 2020-05-04T15:43:47.000-07:00
This reduces code duplication and makes it significantly easier to make
changes to the text cursor without having to individually modify several
files.
diff --git a/src/vs/editor/browser/controller/textAreaHandler.ts b/src/vs/editor/browser/controller/textAreaHandler.ts
@@ -117,7 +117,7 @@ export class TextAreaHandler extends ViewPart {
 		// Text Area (The focus will always be in the textarea when the cursor is blinking)
 		this.textArea = createFastDomNode(document.createElement('textarea'));
 		PartFingerprints.write(this.textArea, PartFingerprint.TextArea);
-		this.textArea.setClassName('inputarea');
+		this.textArea.setClassName('inputarea mouse-text');
 		this.textArea.setAttribute('wrap', 'off');
 		this.textArea.setAttribute('autocorrect', 'off');
 		this.textArea.setAttribute('autocapitalize', 'off');
@@ -279,7 +279,7 @@ export class TextAreaHandler extends ViewPart {
 			}
 
 			// Show the textarea
-			this.textArea.setClassName('inputarea ime-input');
+			this.textArea.setClassName('inputarea mouse-text ime-input');
 
 			this._viewController.compositionStart('keyboard');
 		}));
@@ -301,7 +301,7 @@ export class TextAreaHandler extends ViewPart {
 			this._visibleTextArea = null;
 			this._render();
 
-			this.textArea.setClassName('inputarea');
+			this.textArea.setClassName('inputarea mouse-text');
 			this._viewController.compositionEnd('keyboard');
 		}));
 
diff --git a/src/vs/editor/browser/viewParts/lines/viewLines.css b/src/vs/editor/browser/viewParts/lines/viewLines.css
@@ -23,7 +23,6 @@
 }
 
 .monaco-editor .view-lines {
-	cursor: text;
 	white-space: nowrap;
 }
 
diff --git a/src/vs/editor/browser/viewParts/lines/viewLines.ts b/src/vs/editor/browser/viewParts/lines/viewLines.ts
@@ -134,7 +134,7 @@ export class ViewLines extends ViewPart implements IVisibleLinesHost<ViewLine>,
 		this._viewLineOptions = new ViewLineOptions(conf, this._context.theme.type);
 
 		PartFingerprints.write(this.domNode, PartFingerprint.ViewLines);
-		this.domNode.setClassName('view-lines');
+		this.domNode.setClassName('view-lines mouse-text');
 		Configuration.applyFontInfo(this.domNode, fontInfo);
 
 		// --- width & height
diff --git a/src/vs/editor/browser/viewParts/viewCursors/viewCursor.ts b/src/vs/editor/browser/viewParts/viewCursors/viewCursor.ts
@@ -63,7 +63,7 @@ export class ViewCursor {
 
 		// Create the dom node
 		this._domNode = createFastDomNode(document.createElement('div'));
-		this._domNode.setClassName('cursor');
+		this._domNode.setClassName('cursor mouse-text');
 		this._domNode.setHeight(this._lineHeight);
 		this._domNode.setTop(0);
 		this._domNode.setLeft(0);
@@ -200,7 +200,7 @@ export class ViewCursor {
 			this._domNode.domNode.textContent = this._lastRenderedContent;
 		}
 
-		this._domNode.setClassName('cursor ' + this._renderData.textContentClassName);
+		this._domNode.setClassName('cursor mouse-text ' + this._renderData.textContentClassName);
 
 		this._domNode.setDisplay('block');
 		this._domNode.setTop(this._renderData.top);
diff --git a/src/vs/editor/browser/viewParts/viewCursors/viewCursors.css b/src/vs/editor/browser/viewParts/viewCursors/viewCursors.css
@@ -9,7 +9,6 @@
 
 .monaco-editor .cursors-layer > .cursor {
 	position: absolute;
-	cursor: text;
 	overflow: hidden;
 }
 
diff --git a/src/vs/editor/browser/widget/diffEditorWidget.ts b/src/vs/editor/browser/widget/diffEditorWidget.ts
@@ -2095,7 +2095,7 @@ class InlineViewZonesComputer extends ViewZonesComputer {
 		maxCharsPerLine += this.modifiedEditorOptions.get(EditorOption.scrollBeyondLastColumn);
 
 		let domNode = document.createElement('div');
-		domNode.className = 'view-lines line-delete';
+		domNode.className = 'view-lines line-delete mouse-text';
 		domNode.innerHTML = sb.build();
 		Configuration.applyFontInfoSlow(domNode, fontInfo);
 
diff --git a/src/vs/workbench/browser/media/style.css b/src/vs/workbench/browser/media/style.css
@@ -175,6 +175,10 @@ body.web {
 	cursor: default;
 }
 
+.monaco-workbench .mouse-text {
+	cursor: text;
+}
+
 /* Custom Dropdown (select) Arrows */
 
 .monaco-workbench select {
diff --git a/src/vs/workbench/contrib/comments/browser/commentNode.ts b/src/vs/workbench/contrib/comments/browser/commentNode.ts
@@ -100,7 +100,7 @@ export class CommentNode extends Disposable {
 
 		this.createHeader(this._commentDetailsContainer);
 
-		this._body = dom.append(this._commentDetailsContainer, dom.$('div.comment-body'));
+		this._body = dom.append(this._commentDetailsContainer, dom.$('div.comment-body.mouse-text'));
 		this._md = this.markdownRenderer.render(comment.body).element;
 		this._body.appendChild(this._md);
 
@@ -120,7 +120,7 @@ export class CommentNode extends Disposable {
 	}
 
 	private createHeader(commentDetailsContainer: HTMLElement): void {
-		const header = dom.append(commentDetailsContainer, dom.$('div.comment-title'));
+		const header = dom.append(commentDetailsContainer, dom.$('div.comment-title.mouse-text'));
 		const author = dom.append(header, dom.$('strong.author'));
 		author.innerText = this.comment.userName;
 
diff --git a/src/vs/workbench/contrib/comments/browser/commentThreadWidget.ts b/src/vs/workbench/contrib/comments/browser/commentThreadWidget.ts
@@ -720,7 +720,7 @@ export class ReviewZoneWidget extends ZoneWidget implements ICommentThreadWidget
 	}
 
 	private createReplyButton() {
-		this._reviewThreadReplyButton = <HTMLButtonElement>dom.append(this._commentForm, dom.$('button.review-thread-reply-button'));
+		this._reviewThreadReplyButton = <HTMLButtonElement>dom.append(this._commentForm, dom.$('button.review-thread-reply-button.mouse-text'));
 		this._reviewThreadReplyButton.title = this._commentOptions?.prompt || nls.localize('reply', "Reply...");
 
 		this._reviewThreadReplyButton.textContent = this._commentOptions?.prompt || nls.localize('reply', "Reply...");
diff --git a/src/vs/workbench/contrib/comments/browser/media/review.css b/src/vs/workbench/contrib/comments/browser/media/review.css
@@ -257,7 +257,6 @@
 	line-height: 20px;
 	white-space: nowrap;
 	border: 0px;
-	cursor: text;
 	outline: 1px solid transparent;
 }
 
diff --git a/src/vs/workbench/contrib/debug/browser/media/repl.css b/src/vs/workbench/contrib/debug/browser/media/repl.css
@@ -59,10 +59,6 @@
 	max-width: 150px;
 }
 
-.repl .repl-tree .monaco-list-row {
-	cursor: text;
-}
-
 .repl .repl-tree .output.expression > .value,
 .repl .repl-tree .evaluation-result.expression > .value {
 	margin-left: 0px;
diff --git a/src/vs/workbench/contrib/debug/browser/repl.ts b/src/vs/workbench/contrib/debug/browser/repl.ts
@@ -508,7 +508,7 @@ export class Repl extends ViewPane implements IHistoryNavigationWidget {
 		super.renderBody(parent);
 
 		this.container = dom.append(parent, $('.repl'));
-		const treeContainer = dom.append(this.container, $('.repl-tree'));
+		const treeContainer = dom.append(this.container, $('.repl-tree.mouse-text'));
 		this.createReplInput(this.container);
 
 		this.replDelegate = new ReplDelegate(this.configurationService);

Original file line number	Diff line number	Diff line change
`@@ -23,7 +23,6 @@`
`23`	`23`	`}`
`24`	`24`
`25`	`25`	`.monaco-editor .view-lines {`
`26`		`- cursor: text;`
`27`	`26`	`white-space: nowrap;`
`28`	`27`	`}`
`29`	`28`
Original file line number	Diff line number	Diff line change
`@@ -9,7 +9,6 @@`
`9`	`9`
`10`	`10`	`.monaco-editor .cursors-layer > .cursor {`
`11`	`11`	`position: absolute;`
`12`		`- cursor: text;`
`13`	`12`	`overflow: hidden;`
`14`	`13`	`}`
`15`	`14`
Original file line number	Diff line number	Diff line change
`@@ -175,6 +175,10 @@ body.web {`
`175`	`175`	`cursor: default;`
`176`	`176`	`}`
`177`	`177`
	`178`	`+.monaco-workbench .mouse-text {`
	`179`	`+ cursor: text;`
	`180`	`+}`
	`181`	`+`
`178`	`182`	`/* Custom Dropdown (select) Arrows */`
`179`	`183`
`180`	`184`	`.monaco-workbench select {`
Original file line number	Diff line number	Diff line change
`@@ -720,7 +720,7 @@ export class ReviewZoneWidget extends ZoneWidget implements ICommentThreadWidget`
`720`	`720`	`}`
`721`	`721`
`722`	`722`	`private createReplyButton() {`
`723`		`- this._reviewThreadReplyButton = <HTMLButtonElement>dom.append(this._commentForm, dom.$('button.review-thread-reply-button'));`
	`723`	`+ this._reviewThreadReplyButton = <HTMLButtonElement>dom.append(this._commentForm, dom.$('button.review-thread-reply-button.mouse-text'));`
`724`	`724`	`this._reviewThreadReplyButton.title = this._commentOptions?.prompt \|\| nls.localize('reply', "Reply...");`
`725`	`725`
`726`	`726`	`this._reviewThreadReplyButton.textContent = this._commentOptions?.prompt \|\| nls.localize('reply', "Reply...");`
Original file line number	Diff line number	Diff line change
`@@ -257,7 +257,6 @@`
`257`	`257`	`line-height: 20px;`
`258`	`258`	`white-space: nowrap;`
`259`	`259`	`border: 0px;`
`260`		`- cursor: text;`
`261`	`260`	`outline: 1px solid transparent;`
`262`	`261`	`}`
`263`	`262`