This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.

Commit 249b61e

committed

Mar 22, 2025

·

Merge branch 'refs/heads/main' into intellij_cache_diff

# Conflicts: # gui/src/redux/slices/sessionSlice.ts

2 parents 4b018a6 + ed6f001 commit 249b61eCopy full SHA for 249b61e

95 files changed

+2105

-1262

lines changed

.gitignore
binary
- package-lock.json
core
- commands
  - index.ts
  - util.ts
- config
- context
  - mcp
    - index.ts
  - providers
    - PromptFilesContextProvider.ts
- core.ts
- diff
- edit
  - streamDiffLines.ts
- index.d.ts
- llm
  - llm.test.ts
- package-lock.json
- promptFiles
  - v1
    - slashCommandFromPromptFile.ts
  - v2
- protocol
  - core.ts
  - passThrough.ts
- tools
  - builtIn.ts
  - definitions
- util
  - paths.ts
docs/docs
- customize/deep-dives
  - prompt-files.md
- hub/blocks
  - block-types.md
extensions/intellij/src/main/kotlin/com/github/continuedev/continueintellijextension/constants
- MessageTypes.kt
gui/src
- components
  - CodeToEditCard
    - AddFileCombobox.tsx
  - ConversationStarters
  - OnboardingCard/hooks
    - useSubmitOnboarding.ts
  - gui
    - Switch.tsx
  - index.ts
  - mainInput
  - modelSelection
    - ModelSelect.tsx
    - platform
      - AssistantSelect.tsx
      - AssistantSelectOptions.tsx
- context
  - Auth.tsx
- hooks
  - useSetup.ts
  - useTutorialCard.ts
- pages
  - More
    - MCPServersPreview.tsx
    - More.tsx
  - config
  - gui
    - Chat.tsx
    - EmptyChatBody.tsx
    - StreamError.tsx
    - ToolCallDiv
      - ToolCall.tsx
- redux
  - index.ts
  - selectors
    - index.ts
  - slices
    - configSlice.ts
    - index.ts
    - organizations
    - profiles
    - sessionSlice.ts
    - uiSlice.ts
  - store.ts
  - thunks

95 files changed

+2105

-1262

lines changed

`‎.gitignore`

+1

-Original file line number
+Diff line change
 notes.md
 manual-testing-sandbox/.idea/**
 +manual-testing-sandbox/.continue/**
 extensions/intellij/.idea/**
 **/.idea/workspace.xml

`‎binary/package-lock.json`

+1-1

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

Comments

(0)

Please sign in to comment.