fix: do not display code intelligence hovers on Sourcegraph Extension… · sourcegraph/browser-extensions@893768e · GitHub

This repository was archived by the owner on Jan 22, 2019. It is now read-only.

sourcegraph / browser-extensions Public archive

• Notifications You must be signed in to change notification settings
• Fork 15
• Star 49

• Code
• Issues
• Pull requests 18
• Actions
• Security and quality
• Insights

Additional navigation options

Commit 893768e

Browse filesBrowse the repository at this point in the historyBrowse files

Stephen Gutekanst

committed

fix: do not display code intelligence hovers on Sourcegraph Extension…

…line decorations Prior to this change, hovering over text/links provided by a Sourcegraph Extension would trigger the display of the hover 'loading' indicator. On most files, it goes away quickly (just a flicker), but on some it displays an error:  After this change, we no longer attempt to display hovers etc. on the DOM elements which Sourcegraph Extensions provide. Fixes sourcegraph/sourcegraph-extension-api#67

1 parent 288706e commit 893768e
Copy full SHA for 893768e

2 files changed

+15Lines changed: 15 additions & 0 deletions

File tree

Expand file treeCollapse file tree

Open diff view settings

Filter options

• src/libs/code_intelligence
  • code_intelligence.tsx
  • extensions.tsx

Expand file treeCollapse file tree

Open diff view settings

Collapse file

‎src/libs/code_intelligence/code_intelligence.tsx‎

Copy file name to clipboardExpand all lines: src/libs/code_intelligence/code_intelligence.tsx

+13Lines changed: 13 additions & 0 deletions

Original file line number	Diff line number	Diff line change
@@ -365,6 +365,19 @@ function handleCodeHost(codeHost: CodeHost): Subscription {
365	365	const toURIWithPath = (ctx: AbsoluteRepoFile) =>
366	366	`git://${ctx.repoPath}?${ctx.commitID}#${ctx.filePath}`
367	367
	368	+ const originalDOM = dom
	369	+ dom = {
	370	+ ...dom,
	371	+ // If any parent element has the sourcegraph-extension-element
	372	+ // class then that element does not have any code. We
	373	+ // must check for "any parent element" because extensions
	374	+ // create their DOM changes before the blob is tokenized
	375	+ // into multiple elements.
	376	+ getCodeElementFromTarget: (target: HTMLElement): HTMLElement | null =>
	377	+ target.closest('.sourcegraph-extension-element') !== null
	378	+ ? null
	379	+ : originalDOM.getCodeElementFromTarget(target),
	380	+ }
368	381	if (extensionsController) {
369	382	const { content, baseContent } = getContentOfCodeView(codeView, { isDiff, getLineRanges, dom })
370	383

Collapse file

‎src/libs/code_intelligence/extensions.tsx‎

Copy file name to clipboardExpand all lines: src/libs/code_intelligence/extensions.tsx

+2Lines changed: 2 additions & 0 deletions

Original file line number	Diff line number	Diff line change
@@ -174,13 +174,15 @@ export const applyDecoration = (
174	174	if (decoration.after) {
175	175	const linkTo = (url: string) => (e: HTMLElement): HTMLElement => {
176	176	const link = document.createElement('a')
	177	+ link.className = 'sourcegraph-extension-element'
177	178	link.setAttribute('href', url)
178	179	link.style.color = decoration.after!.color || null
179	180	link.appendChild(e)
180	181	return link
181	182	}
182	183
183	184	const after = document.createElement('span')
	185	+ after.className = 'sourcegraph-extension-element'
184	186	after.style.backgroundColor = decoration.after.backgroundColor || null
185	187	after.textContent = decoration.after.contentText || null
186	188

0 commit comments

Comments

0 (0)