From be9f522fbba4cfcbe216bb3a4bd5ce9776c7d0a7 Mon Sep 17 00:00:00 2001 From: Logan Yang Date: Sat, 15 Apr 2023 22:39:28 -0700 Subject: [PATCH] Sort imports --- src/components/Chat.tsx | 18 +++++++++--------- src/components/ChatComponents/ChatIcons.tsx | 6 ++++-- src/components/ChatComponents/ChatMessages.tsx | 6 +++--- .../ChatComponents/ChatSingleMessage.tsx | 8 ++++---- src/components/CopilotView.tsx | 12 ++++++------ src/components/Markdown/CodeBlock.tsx | 5 ++--- src/context.ts | 4 ++-- src/main.ts | 6 +++--- src/settings.ts | 2 +- src/sharedState.ts | 2 +- src/utils.ts | 6 +++--- 11 files changed, 38 insertions(+), 37 deletions(-) diff --git a/src/components/Chat.tsx b/src/components/Chat.tsx index d9055dd4..8e023f76 100644 --- a/src/components/Chat.tsx +++ b/src/components/Chat.tsx @@ -1,21 +1,21 @@ -import React, { useState, useContext } from 'react'; -import { AppContext } from '@/context'; -import SharedState, { ChatMessage, useSharedState } from '@/sharedState'; -import { USER_SENDER, AI_SENDER } from '@/constants'; -import { OpenAIStream, Role } from '@/openAiStream'; -import { TFile } from 'obsidian'; -import ChatMessages from '@/components/ChatComponents/ChatMessages'; import ChatIcons from '@/components/ChatComponents/ChatIcons'; import ChatInput from '@/components/ChatComponents/ChatInput'; +import ChatMessages from '@/components/ChatComponents/ChatMessages'; +import { AI_SENDER, USER_SENDER } from '@/constants'; +import { AppContext } from '@/context'; +import { CopilotSettings } from '@/main'; +import { OpenAIStream, Role } from '@/openAiStream'; +import SharedState, { ChatMessage, useSharedState } from '@/sharedState'; import { - getChatContext, formatDateTime, + getChatContext, getFileContent, getFileName, sanitizeSettings, useNoteAsContextPrompt, } from '@/utils'; -import { CopilotSettings } from '@/main'; +import { TFile } from 'obsidian'; +import React, { useContext, useState } from 'react'; interface ChatProps { diff --git a/src/components/ChatComponents/ChatIcons.tsx b/src/components/ChatComponents/ChatIcons.tsx index 1a2ad604..45d3d938 100644 --- a/src/components/ChatComponents/ChatIcons.tsx +++ b/src/components/ChatComponents/ChatIcons.tsx @@ -1,7 +1,9 @@ -import React from 'react'; import { - StopIcon, RefreshIcon, SaveAsNoteIcon, UseActiveNoteAsContextIcon + RefreshIcon, SaveAsNoteIcon, + StopIcon, + UseActiveNoteAsContextIcon } from '@/components/Icons'; +import React from 'react'; interface ChatIconsProps { currentModel: string; diff --git a/src/components/ChatComponents/ChatMessages.tsx b/src/components/ChatComponents/ChatMessages.tsx index 3036805a..0b3a2093 100644 --- a/src/components/ChatComponents/ChatMessages.tsx +++ b/src/components/ChatComponents/ChatMessages.tsx @@ -1,8 +1,8 @@ -import React, { useEffect } from 'react'; -import { ChatMessage } from '@/sharedState'; import ChatSingleMessage from '@/components/ChatComponents/ChatSingleMessage'; -import ReactMarkdown from '@/components/Markdown/MemoizedReactMarkdown'; import { BotIcon } from '@/components/Icons'; +import ReactMarkdown from '@/components/Markdown/MemoizedReactMarkdown'; +import { ChatMessage } from '@/sharedState'; +import React, { useEffect } from 'react'; interface ChatMessagesProps { chatHistory: ChatMessage[]; diff --git a/src/components/ChatComponents/ChatSingleMessage.tsx b/src/components/ChatComponents/ChatSingleMessage.tsx index 32ee7e80..1209e432 100644 --- a/src/components/ChatComponents/ChatSingleMessage.tsx +++ b/src/components/ChatComponents/ChatSingleMessage.tsx @@ -1,8 +1,8 @@ -import React, { useState } from 'react'; -import { ChatMessage } from '@/sharedState'; -import { USER_SENDER } from '@/constants'; -import { UserIcon, BotIcon, CopyClipboardIcon, CheckIcon } from '@/components/Icons'; +import { BotIcon, CheckIcon, CopyClipboardIcon, UserIcon } from '@/components/Icons'; import ReactMarkdown from '@/components/Markdown/MemoizedReactMarkdown'; +import { USER_SENDER } from '@/constants'; +import { ChatMessage } from '@/sharedState'; +import React, { useState } from 'react'; interface ChatSingleMessageProps { diff --git a/src/components/CopilotView.tsx b/src/components/CopilotView.tsx index 884e3f2b..d8a20daa 100644 --- a/src/components/CopilotView.tsx +++ b/src/components/CopilotView.tsx @@ -1,11 +1,11 @@ -import { WorkspaceLeaf, ItemView } from 'obsidian'; -import SharedState from '@/sharedState'; -import * as React from 'react'; import Chat from '@/components/Chat'; -import { createRoot, Root } from 'react-dom/client'; -import { AppContext } from '@/context'; import { CHAT_VIEWTYPE } from '@/constants'; -import CopilotPlugin, {CopilotSettings} from '@/main'; +import { AppContext } from '@/context'; +import CopilotPlugin, { CopilotSettings } from '@/main'; +import SharedState from '@/sharedState'; +import { ItemView, WorkspaceLeaf } from 'obsidian'; +import * as React from 'react'; +import { Root, createRoot } from 'react-dom/client'; export default class CopilotView extends ItemView { diff --git a/src/components/Markdown/CodeBlock.tsx b/src/components/Markdown/CodeBlock.tsx index ec4c13e9..6c895f39 100644 --- a/src/components/Markdown/CodeBlock.tsx +++ b/src/components/Markdown/CodeBlock.tsx @@ -1,10 +1,9 @@ -import React from 'react'; import { IconCheck, IconClipboard, IconDownload } from '@tabler/icons-react'; import { useTranslation } from 'next-i18next'; -import { FC, memo, useState } from 'react'; +import PropTypes from 'prop-types'; +import React, { FC, memo, useState } from 'react'; import { Prism as SyntaxHighlighter } from 'react-syntax-highlighter'; import { oneDark } from 'react-syntax-highlighter/dist/cjs/styles/prism'; -import PropTypes from 'prop-types'; interface CodeProps { diff --git a/src/context.ts b/src/context.ts index 9729947b..1aaf0794 100644 --- a/src/context.ts +++ b/src/context.ts @@ -1,6 +1,6 @@ -import * as React from 'react'; -import { App } from 'obsidian'; import SharedState from '@/sharedState'; +import { App } from 'obsidian'; +import * as React from 'react'; // App context export const AppContext = React.createContext(undefined); diff --git a/src/main.ts b/src/main.ts index 9d87f323..d5da2aba 100644 --- a/src/main.ts +++ b/src/main.ts @@ -1,8 +1,8 @@ -import { Plugin, WorkspaceLeaf } from 'obsidian'; -import { CopilotSettingTab } from '@/settings'; -import SharedState from '@/sharedState'; import CopilotView from '@/components/CopilotView'; import { CHAT_VIEWTYPE, DEFAULT_SETTINGS } from '@/constants'; +import { CopilotSettingTab } from '@/settings'; +import SharedState from '@/sharedState'; +import { Plugin, WorkspaceLeaf } from 'obsidian'; export interface CopilotSettings { diff --git a/src/settings.ts b/src/settings.ts index 9388d078..d0c9a08c 100644 --- a/src/settings.ts +++ b/src/settings.ts @@ -1,5 +1,5 @@ import CopilotPlugin from "@/main"; -import { App, PluginSettingTab, Setting, DropdownComponent } from "obsidian"; +import { App, DropdownComponent, PluginSettingTab, Setting } from "obsidian"; export class CopilotSettingTab extends PluginSettingTab { plugin: CopilotPlugin; diff --git a/src/sharedState.ts b/src/sharedState.ts index d790135e..92ff3101 100644 --- a/src/sharedState.ts +++ b/src/sharedState.ts @@ -1,4 +1,4 @@ -import { useState, useEffect } from 'react'; +import { useEffect, useState } from 'react'; export interface ChatMessage { message: string; diff --git a/src/utils.ts b/src/utils.ts index 3906e9ca..0611b7ca 100644 --- a/src/utils.ts +++ b/src/utils.ts @@ -1,7 +1,7 @@ -import { ChatMessage } from '@/sharedState'; -import { USER_SENDER, DEFAULT_SETTINGS } from '@/constants'; -import { TFile } from 'obsidian'; +import { DEFAULT_SETTINGS, USER_SENDER } from '@/constants'; import { CopilotSettings } from '@/main'; +import { ChatMessage } from '@/sharedState'; +import { TFile } from 'obsidian'; // Returns the last N messages from the chat history, // last one being the newest ai message