From fa1068d92de75d28a5a49e1ee8a92f2a631cd912 Mon Sep 17 00:00:00 2001 From: Saoud Rizwan <7799382+saoudrizwan@users.noreply.github.com> Date: Sat, 3 Aug 2024 15:47:41 -0400 Subject: [PATCH] Refactor utilities to utils for consistency --- webview-ui/src/App.tsx | 2 +- webview-ui/src/components/ChatRow.tsx | 4 ++-- webview-ui/src/components/ChatView.tsx | 10 +++++----- webview-ui/src/components/CodeBlock/CodeBlock.tsx | 4 ++-- webview-ui/src/components/SettingsView.tsx | 4 ++-- webview-ui/src/components/TaskHeader.tsx | 2 +- webview-ui/src/components/WelcomeView.tsx | 4 ++-- .../src/{utilities => utils}/combineApiRequests.ts | 0 .../{utilities => utils}/combineCommandSequences.ts | 0 webview-ui/src/{utilities => utils}/getApiMetrics.ts | 0 .../src/{utilities => utils}/getLanguageFromPath.ts | 0 .../getSyntaxHighlighterStyleFromTheme.ts | 0 webview-ui/src/{utilities => utils}/mockMessages.ts | 0 webview-ui/src/{utilities => utils}/validate.ts | 0 .../{utilities => utils}/vscode-themes/github-dark.ts | 0 .../{utilities => utils}/vscode-themes/github-light.ts | 0 .../src/{utilities => utils}/vscode-themes/index.ts | 0 .../vscode-themes/one-dark-example.ts | 0 webview-ui/src/{utilities => utils}/vscode.ts | 0 19 files changed, 15 insertions(+), 15 deletions(-) rename webview-ui/src/{utilities => utils}/combineApiRequests.ts (100%) rename webview-ui/src/{utilities => utils}/combineCommandSequences.ts (100%) rename webview-ui/src/{utilities => utils}/getApiMetrics.ts (100%) rename webview-ui/src/{utilities => utils}/getLanguageFromPath.ts (100%) rename webview-ui/src/{utilities => utils}/getSyntaxHighlighterStyleFromTheme.ts (100%) rename webview-ui/src/{utilities => utils}/mockMessages.ts (100%) rename webview-ui/src/{utilities => utils}/validate.ts (100%) rename webview-ui/src/{utilities => utils}/vscode-themes/github-dark.ts (100%) rename webview-ui/src/{utilities => utils}/vscode-themes/github-light.ts (100%) rename webview-ui/src/{utilities => utils}/vscode-themes/index.ts (100%) rename webview-ui/src/{utilities => utils}/vscode-themes/one-dark-example.ts (100%) rename webview-ui/src/{utilities => utils}/vscode.ts (100%) diff --git a/webview-ui/src/App.tsx b/webview-ui/src/App.tsx index 70c5577..a6b47c9 100644 --- a/webview-ui/src/App.tsx +++ b/webview-ui/src/App.tsx @@ -4,7 +4,7 @@ import ChatView from "./components/ChatView" import SettingsView from "./components/SettingsView" import { ClaudeMessage, ExtensionMessage } from "@shared/ExtensionMessage" import WelcomeView from "./components/WelcomeView" -import { vscode } from "./utilities/vscode" +import { vscode } from "./utils/vscode" import { useEvent } from "react-use" import { ApiConfiguration } from "@shared/api" diff --git a/webview-ui/src/components/ChatRow.tsx b/webview-ui/src/components/ChatRow.tsx index 76a6d0e..ee91344 100644 --- a/webview-ui/src/components/ChatRow.tsx +++ b/webview-ui/src/components/ChatRow.tsx @@ -1,8 +1,8 @@ import { ClaudeAsk, ClaudeMessage, ClaudeSay, ClaudeSayTool } from "@shared/ExtensionMessage" import { VSCodeBadge, VSCodeButton, VSCodeProgressRing } from "@vscode/webview-ui-toolkit/react" import React from "react" -import { COMMAND_OUTPUT_STRING } from "../utilities/combineCommandSequences" -import { SyntaxHighlighterStyle } from "../utilities/getSyntaxHighlighterStyleFromTheme" +import { COMMAND_OUTPUT_STRING } from "../utils/combineCommandSequences" +import { SyntaxHighlighterStyle } from "../utils/getSyntaxHighlighterStyleFromTheme" import CodeBlock from "./CodeBlock/CodeBlock" import Markdown from "react-markdown" import { Prism as SyntaxHighlighter } from "react-syntax-highlighter" diff --git a/webview-ui/src/components/ChatView.tsx b/webview-ui/src/components/ChatView.tsx index c40ca41..2f98592 100644 --- a/webview-ui/src/components/ChatView.tsx +++ b/webview-ui/src/components/ChatView.tsx @@ -4,11 +4,11 @@ import { KeyboardEvent, useCallback, useEffect, useMemo, useRef, useState } from import vsDarkPlus from "react-syntax-highlighter/dist/esm/styles/prism/vsc-dark-plus" import DynamicTextArea from "react-textarea-autosize" import { useEvent, useMount } from "react-use" -import { combineApiRequests } from "../utilities/combineApiRequests" -import { combineCommandSequences } from "../utilities/combineCommandSequences" -import { getApiMetrics } from "../utilities/getApiMetrics" -import { getSyntaxHighlighterStyleFromTheme } from "../utilities/getSyntaxHighlighterStyleFromTheme" -import { vscode } from "../utilities/vscode" +import { combineApiRequests } from "../utils/combineApiRequests" +import { combineCommandSequences } from "../utils/combineCommandSequences" +import { getApiMetrics } from "../utils/getApiMetrics" +import { getSyntaxHighlighterStyleFromTheme } from "../utils/getSyntaxHighlighterStyleFromTheme" +import { vscode } from "../utils/vscode" import ChatRow from "./ChatRow" import TaskHeader from "./TaskHeader" import { Virtuoso, type VirtuosoHandle } from "react-virtuoso" diff --git a/webview-ui/src/components/CodeBlock/CodeBlock.tsx b/webview-ui/src/components/CodeBlock/CodeBlock.tsx index f93d42b..a008f0b 100644 --- a/webview-ui/src/components/CodeBlock/CodeBlock.tsx +++ b/webview-ui/src/components/CodeBlock/CodeBlock.tsx @@ -1,7 +1,7 @@ import { useMemo } from "react" import { Prism as SyntaxHighlighter } from "react-syntax-highlighter" -import { getLanguageFromPath } from "../../utilities/getLanguageFromPath" -import { SyntaxHighlighterStyle } from "../../utilities/getSyntaxHighlighterStyleFromTheme" +import { getLanguageFromPath } from "../../utils/getLanguageFromPath" +import { SyntaxHighlighterStyle } from "../../utils/getSyntaxHighlighterStyleFromTheme" /* const vscodeSyntaxStyle: React.CSSProperties = { diff --git a/webview-ui/src/components/SettingsView.tsx b/webview-ui/src/components/SettingsView.tsx index b16aa78..86e3f93 100644 --- a/webview-ui/src/components/SettingsView.tsx +++ b/webview-ui/src/components/SettingsView.tsx @@ -1,8 +1,8 @@ import { ApiConfiguration } from "@shared/api" import { VSCodeButton, VSCodeDivider, VSCodeLink, VSCodeTextField } from "@vscode/webview-ui-toolkit/react" import React, { useEffect, useState } from "react" -import { validateApiConfiguration, validateMaxRequestsPerTask } from "../utilities/validate" -import { vscode } from "../utilities/vscode" +import { validateApiConfiguration, validateMaxRequestsPerTask } from "../utils/validate" +import { vscode } from "../utils/vscode" import ApiOptions from "./ApiOptions" type SettingsViewProps = { diff --git a/webview-ui/src/components/TaskHeader.tsx b/webview-ui/src/components/TaskHeader.tsx index 0b523c2..7b0f868 100644 --- a/webview-ui/src/components/TaskHeader.tsx +++ b/webview-ui/src/components/TaskHeader.tsx @@ -2,7 +2,7 @@ import { VSCodeButton } from "@vscode/webview-ui-toolkit/react" import React, { useEffect, useRef, useState } from "react" import TextTruncate from "react-text-truncate" import { useWindowSize } from "react-use" -import { vscode } from "../utilities/vscode" +import { vscode } from "../utils/vscode" interface TaskHeaderProps { taskText: string diff --git a/webview-ui/src/components/WelcomeView.tsx b/webview-ui/src/components/WelcomeView.tsx index d1d80c5..dd3976b 100644 --- a/webview-ui/src/components/WelcomeView.tsx +++ b/webview-ui/src/components/WelcomeView.tsx @@ -1,8 +1,8 @@ import { ApiConfiguration } from "@shared/api" import { VSCodeButton, VSCodeLink } from "@vscode/webview-ui-toolkit/react" import React, { useEffect, useState } from "react" -import { validateApiConfiguration } from "../utilities/validate" -import { vscode } from "../utilities/vscode" +import { validateApiConfiguration } from "../utils/validate" +import { vscode } from "../utils/vscode" import ApiOptions from "./ApiOptions" interface WelcomeViewProps { diff --git a/webview-ui/src/utilities/combineApiRequests.ts b/webview-ui/src/utils/combineApiRequests.ts similarity index 100% rename from webview-ui/src/utilities/combineApiRequests.ts rename to webview-ui/src/utils/combineApiRequests.ts diff --git a/webview-ui/src/utilities/combineCommandSequences.ts b/webview-ui/src/utils/combineCommandSequences.ts similarity index 100% rename from webview-ui/src/utilities/combineCommandSequences.ts rename to webview-ui/src/utils/combineCommandSequences.ts diff --git a/webview-ui/src/utilities/getApiMetrics.ts b/webview-ui/src/utils/getApiMetrics.ts similarity index 100% rename from webview-ui/src/utilities/getApiMetrics.ts rename to webview-ui/src/utils/getApiMetrics.ts diff --git a/webview-ui/src/utilities/getLanguageFromPath.ts b/webview-ui/src/utils/getLanguageFromPath.ts similarity index 100% rename from webview-ui/src/utilities/getLanguageFromPath.ts rename to webview-ui/src/utils/getLanguageFromPath.ts diff --git a/webview-ui/src/utilities/getSyntaxHighlighterStyleFromTheme.ts b/webview-ui/src/utils/getSyntaxHighlighterStyleFromTheme.ts similarity index 100% rename from webview-ui/src/utilities/getSyntaxHighlighterStyleFromTheme.ts rename to webview-ui/src/utils/getSyntaxHighlighterStyleFromTheme.ts diff --git a/webview-ui/src/utilities/mockMessages.ts b/webview-ui/src/utils/mockMessages.ts similarity index 100% rename from webview-ui/src/utilities/mockMessages.ts rename to webview-ui/src/utils/mockMessages.ts diff --git a/webview-ui/src/utilities/validate.ts b/webview-ui/src/utils/validate.ts similarity index 100% rename from webview-ui/src/utilities/validate.ts rename to webview-ui/src/utils/validate.ts diff --git a/webview-ui/src/utilities/vscode-themes/github-dark.ts b/webview-ui/src/utils/vscode-themes/github-dark.ts similarity index 100% rename from webview-ui/src/utilities/vscode-themes/github-dark.ts rename to webview-ui/src/utils/vscode-themes/github-dark.ts diff --git a/webview-ui/src/utilities/vscode-themes/github-light.ts b/webview-ui/src/utils/vscode-themes/github-light.ts similarity index 100% rename from webview-ui/src/utilities/vscode-themes/github-light.ts rename to webview-ui/src/utils/vscode-themes/github-light.ts diff --git a/webview-ui/src/utilities/vscode-themes/index.ts b/webview-ui/src/utils/vscode-themes/index.ts similarity index 100% rename from webview-ui/src/utilities/vscode-themes/index.ts rename to webview-ui/src/utils/vscode-themes/index.ts diff --git a/webview-ui/src/utilities/vscode-themes/one-dark-example.ts b/webview-ui/src/utils/vscode-themes/one-dark-example.ts similarity index 100% rename from webview-ui/src/utilities/vscode-themes/one-dark-example.ts rename to webview-ui/src/utils/vscode-themes/one-dark-example.ts diff --git a/webview-ui/src/utilities/vscode.ts b/webview-ui/src/utils/vscode.ts similarity index 100% rename from webview-ui/src/utilities/vscode.ts rename to webview-ui/src/utils/vscode.ts