Skip to content

First pass at using VS Code UI toolkit #1382

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
charisk merged 3 commits into from
Jun 16, 2022
Merged

First pass at using VS Code UI toolkit #1382

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
897682f
First pass at using VS Code UI toolkit
charisk Jun 15, 2022
3d83fcb
Override font-family for link i nmessage
charisk Jun 15, 2022
fd61090
Merge branch 'main' into charisk/webview-ui-toolkit
charisk Jun 16, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
123 changes: 119 additions & 4 deletions extensions/ql-vscode/package-lock.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions extensions/ql-vscode/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1133,6 +1133,7 @@
"@octokit/rest": "^18.5.6",
"@primer/octicons-react": "^16.3.0",
"@primer/react": "^35.0.0",
"@vscode/webview-ui-toolkit": "^1.0.0",
"child-process-promise": "^2.2.1",
"classnames": "~2.2.6",
"d3": "^6.3.1",
Expand Down
22 changes: 0 additions & 22 deletions extensions/ql-vscode/src/remote-queries/view/ActionButton.tsx
View file
Open in desktop

This file was deleted.

29 changes: 0 additions & 29 deletions extensions/ql-vscode/src/remote-queries/view/Badge.tsx
View file
Open in desktop

This file was deleted.

7 changes: 4 additions & 3 deletions extensions/ql-vscode/src/remote-queries/view/CodePaths.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
import { TriangleDownIcon, XCircleIcon } from '@primer/octicons-react';
import { ActionList, ActionMenu, Box, Button, Label, Link, Overlay } from '@primer/react';
import { ActionList, ActionMenu, Box, Button, Label, Overlay } from '@primer/react';
import { VSCodeLink } from '@vscode/webview-ui-toolkit/react';
import * as React from 'react';
import { useRef, useState } from 'react';
import styled from 'styled-components';
Expand Down Expand Up @@ -135,12 +136,12 @@ const CodePaths = ({

return (
<Box ref={anchorRef}>
<Link
<VSCodeLink
onClick={() => setIsOpen(true)}
ref={linkRef}
sx={{ cursor: 'pointer' }}>
Show paths
</Link>
</VSCodeLink>
{isOpen && (
<Overlay
returnFocusRef={linkRef}
Expand Down
12 changes: 7 additions & 5 deletions extensions/ql-vscode/src/remote-queries/view/FileCodeSnippet.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,11 @@
import * as React from 'react';
import styled from 'styled-components';
import { CodeSnippet, FileLink, HighlightedRegion, AnalysisMessage, ResultSeverity } from '../shared/analysis-result';
import { Box, Link } from '@primer/react';
import { Box } from '@primer/react';
import VerticalSpace from './VerticalSpace';
import { createRemoteFileRef } from '../../pure/location-link-utils';
import { parseHighlightedLine, shouldHighlightLine } from '../../pure/sarif-utils';
import { VSCodeLink } from '@vscode/webview-ui-toolkit/react';

const borderColor = 'var(--vscode-editor-snippetFinalTabstopHighlightBorder)';
const warningColor = '#966C23';
Expand Down Expand Up @@ -95,14 +96,15 @@ const Message = ({
case 'text':
return <span key={`token-${index}`}>{token.text}</span>;
case 'location':
return <Link
return <VSCodeLink
Comment thread
charisk marked this conversation as resolved.
style={{ fontFamily: 'var(--vscode-editor-font-family)' }}
key={`token-${index}`}
href={createRemoteFileRef(
token.location.fileLink,
token.location.highlightedRegion?.startLine,
token.location.highlightedRegion?.endLine)}>
{token.text}
</Link>;
</VSCodeLink>;
default:
return <></>;
}
Expand Down Expand Up @@ -170,7 +172,7 @@ const FileCodeSnippet = ({
return (
<Container>
<TitleContainer>
<Link href={titleFileUri}>{fileLink.filePath}</Link>
<VSCodeLink href={titleFileUri}>{fileLink.filePath}</VSCodeLink>
</TitleContainer>
</Container>
);
Expand All @@ -181,7 +183,7 @@ const FileCodeSnippet = ({
return (
<Container>
<TitleContainer>
<Link href={titleFileUri}>{fileLink.filePath}</Link>
<VSCodeLink href={titleFileUri}>{fileLink.filePath}</VSCodeLink>
</TitleContainer>
<CodeContainer>
{code.map((line, index) => (
Expand Down
5 changes: 3 additions & 2 deletions extensions/ql-vscode/src/remote-queries/view/RawResultsTable.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
import * as React from 'react';
import { Box, Link } from '@primer/react';
import { Box } from '@primer/react';
import { VSCodeLink } from '@vscode/webview-ui-toolkit/react';
import { CellValue, RawResultSet, ResultSetSchema } from '../../pure/bqrs-cli-types';
import { tryGetRemoteLocation } from '../../pure/bqrs-utils';
import { useState } from 'react';
Expand Down Expand Up @@ -50,7 +51,7 @@ const Cell = ({
const url = tryGetRemoteLocation(value.url, fileLinkPrefix, sourceLocationPrefix);
const safeLabel = convertNonPrintableChars(value.label);
if (url) {
return <Link href={url}>{safeLabel}</Link>;
return <VSCodeLink href={url}>{safeLabel}</VSCodeLink>;
} else {
return <span>{safeLabel}</span>;
}
Expand Down
Loading