Merge pull request #5394 from Kilo-Org/mark/merge-continuedev-into-ghost

Merge continuedev into ghost

src/api/providers/__tests__/kilocode-openrouter.spec.ts

@@ -27,10 +27,10 @@ import {
 	X_KILOCODE_MACHINEID,
 	X_KILOCODE_MODE,
 } from "../../../shared/kilocode/headers"
-import { streamSse } from "../../../services/continuedev/core/fetch/stream"
+import { streamSse } from "../../../services/ghost/continuedev/core/fetch/stream"
 
 // Mock the stream module
-vitest.mock("../../../services/continuedev/core/fetch/stream", () => ({
+vitest.mock("../../../services/ghost/continuedev/core/fetch/stream", () => ({
 	streamSse: vitest.fn(),
 }))
 

src/api/providers/__tests__/mistral-fim.spec.ts

@@ -6,10 +6,10 @@ vitest.mock("vscode", () => ({}))
 
 import { MistralHandler } from "../mistral"
 import { ApiHandlerOptions } from "../../../shared/api"
-import { streamSse } from "../../../services/continuedev/core/fetch/stream"
+import { streamSse } from "../../../services/ghost/continuedev/core/fetch/stream"
 
 // Mock the stream module
-vitest.mock("../../../services/continuedev/core/fetch/stream", () => ({
+vitest.mock("../../../services/ghost/continuedev/core/fetch/stream", () => ({
 	streamSse: vitest.fn(),
 }))
 

src/api/providers/kilocode-openrouter.ts

@@ -19,7 +19,7 @@ import {
 	X_KILOCODE_MACHINEID,
 } from "../../shared/kilocode/headers"
 import { DEFAULT_HEADERS } from "./constants"
-import { streamSse } from "../../services/continuedev/core/fetch/stream"
+import { streamSse } from "../../services/ghost/continuedev/core/fetch/stream"
 import { getEditorNameHeader } from "../../core/kilocode/wrapper"
 import type { FimHandler } from "./kilocode/FimHandler"
 import * as vscode from "vscode"

src/api/providers/mistral.ts

@@ -20,7 +20,7 @@ import { handleProviderError } from "./utils/error-handler"
 import { BaseProvider } from "./base-provider"
 import type { SingleCompletionHandler, ApiHandlerCreateMessageMetadata } from "../index"
 import { DEFAULT_HEADERS } from "./constants" // kilocode_change
-import { streamSse } from "../../services/continuedev/core/fetch/stream" // kilocode_change
+import { streamSse } from "../../services/ghost/continuedev/core/fetch/stream" // kilocode_change
 import type { CompletionUsage } from "./openrouter" // kilocode_change
 import type { FimHandler } from "./kilocode/FimHandler" // kilocode_change
 

src/esbuild.mjs

@@ -88,7 +88,7 @@ async function main() {
 					copyPaths([["walkthrough", "walkthrough"]], srcDir, distDir)
 
 					// Copy tree-sitter files to dist directory
-					copyPaths([["services/continuedev/tree-sitter", "tree-sitter"]], srcDir, distDir)
+					copyPaths([["services/ghost/continuedev/tree-sitter", "tree-sitter"]], srcDir, distDir)
 
 					// Copy JSDOM xhr-sync-worker.js to fix runtime resolution
 					const jsdomWorkerDest = path.join(distDir, "xhr-sync-worker.js")

src/eslint.config.mjs

@@ -37,6 +37,6 @@ export default [
 		},
 	},
 	{
-		ignores: ["webview-ui", "out", "services/continuedev/core/llm/llamaTokenizer.js", "**/__fixtures__"],
+		ignores: ["webview-ui", "out", "services/ghost/continuedev/core/llm/llamaTokenizer.js", "**/__fixtures__"],
 	},
 ]

src/services/continuedev/LICENSE

@@ -1,201 +0,0 @@
-                                 Apache License
-                           Version 2.0, January 2004
-                        http://www.apache.org/licenses/
-
-   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
-   1. Definitions.
-
-      "License" shall mean the terms and conditions for use, reproduction,
-      and distribution as defined by Sections 1 through 9 of this document.
-
-      "Licensor" shall mean the copyright owner or entity authorized by
-      the copyright owner that is granting the License.
-
-      "Legal Entity" shall mean the union of the acting entity and all
-      other entities that control, are controlled by, or are under common
-      control with that entity. For the purposes of this definition,
-      "control" means (i) the power, direct or indirect, to cause the
-      direction or management of such entity, whether by contract or
-      otherwise, or (ii) ownership of fifty percent (50%) or more of the
-      outstanding shares, or (iii) beneficial ownership of such entity.
-
-      "You" (or "Your") shall mean an individual or Legal Entity
-      exercising permissions granted by this License.
-
-      "Source" form shall mean the preferred form for making modifications,
-      including but not limited to software source code, documentation
-      source, and configuration files.
-
-      "Object" form shall mean any form resulting from mechanical
-      transformation or translation of a Source form, including but
-      not limited to compiled object code, generated documentation,
-      and conversions to other media types.
-
-      "Work" shall mean the work of authorship, whether in Source or
-      Object form, made available under the License, as indicated by a
-      copyright notice that is included in or attached to the work
-      (an example is provided in the Appendix below).
-
-      "Derivative Works" shall mean any work, whether in Source or Object
-      form, that is based on (or derived from) the Work and for which the
-      editorial revisions, annotations, elaborations, or other modifications
-      represent, as a whole, an original work of authorship. For the purposes
-      of this License, Derivative Works shall not include works that remain
-      separable from, or merely link (or bind by name) to the interfaces of,
-      the Work and Derivative Works thereof.
-
-      "Contribution" shall mean any work of authorship, including
-      the original version of the Work and any modifications or additions
-      to that Work or Derivative Works thereof, that is intentionally
-      submitted to Licensor for inclusion in the Work by the copyright owner
-      or by an individual or Legal Entity authorized to submit on behalf of
-      the copyright owner. For the purposes of this definition, "submitted"
-      means any form of electronic, verbal, or written communication sent
-      to the Licensor or its representatives, including but not limited to
-      communication on electronic mailing lists, source code control systems,
-      and issue tracking systems that are managed by, or on behalf of, the
-      Licensor for the purpose of discussing and improving the Work, but
-      excluding communication that is conspicuously marked or otherwise
-      designated in writing by the copyright owner as "Not a Contribution."
-
-      "Contributor" shall mean Licensor and any individual or Legal Entity
-      on behalf of whom a Contribution has been received by Licensor and
-      subsequently incorporated within the Work.
-
-   2. Grant of Copyright License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      copyright license to reproduce, prepare Derivative Works of,
-      publicly display, publicly perform, sublicense, and distribute the
-      Work and such Derivative Works in Source or Object form.
-
-   3. Grant of Patent License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      (except as stated in this section) patent license to make, have made,
-      use, offer to sell, sell, import, and otherwise transfer the Work,
-      where such license applies only to those patent claims licensable
-      by such Contributor that are necessarily infringed by their
-      Contribution(s) alone or by combination of their Contribution(s)
-      with the Work to which such Contribution(s) was submitted. If You
-      institute patent litigation against any entity (including a
-      cross-claim or counterclaim in a lawsuit) alleging that the Work
-      or a Contribution incorporated within the Work constitutes direct
-      or contributory patent infringement, then any patent licenses
-      granted to You under this License for that Work shall terminate
-      as of the date such litigation is filed.
-
-   4. Redistribution. You may reproduce and distribute copies of the
-      Work or Derivative Works thereof in any medium, with or without
-      modifications, and in Source or Object form, provided that You
-      meet the following conditions:
-
-      (a) You must give any other recipients of the Work or
-          Derivative Works a copy of this License; and
-
-      (b) You must cause any modified files to carry prominent notices
-          stating that You changed the files; and
-
-      (c) You must retain, in the Source form of any Derivative Works
-          that You distribute, all copyright, patent, trademark, and
-          attribution notices from the Source form of the Work,
-          excluding those notices that do not pertain to any part of
-          the Derivative Works; and
-
-      (d) If the Work includes a "NOTICE" text file as part of its
-          distribution, then any Derivative Works that You distribute must
-          include a readable copy of the attribution notices contained
-          within such NOTICE file, excluding those notices that do not
-          pertain to any part of the Derivative Works, in at least one
-          of the following places: within a NOTICE text file distributed
-          as part of the Derivative Works; within the Source form or
-          documentation, if provided along with the Derivative Works; or,
-          within a display generated by the Derivative Works, if and
-          wherever such third-party notices normally appear. The contents
-          of the NOTICE file are for informational purposes only and
-          do not modify the License. You may add Your own attribution
-          notices within Derivative Works that You distribute, alongside
-          or as an addendum to the NOTICE text from the Work, provided
-          that such additional attribution notices cannot be construed
-          as modifying the License.
-
-      You may add Your own copyright statement to Your modifications and
-      may provide additional or different license terms and conditions
-      for use, reproduction, or distribution of Your modifications, or
-      for any such Derivative Works as a whole, provided Your use,
-      reproduction, and distribution of the Work otherwise complies with
-      the conditions stated in this License.
-
-   5. Submission of Contributions. Unless You explicitly state otherwise,
-      any Contribution intentionally submitted for inclusion in the Work
-      by You to the Licensor shall be under the terms and conditions of
-      this License, without any additional terms or conditions.
-      Notwithstanding the above, nothing herein shall supersede or modify
-      the terms of any separate license agreement you may have executed
-      with Licensor regarding such Contributions.
-
-   6. Trademarks. This License does not grant permission to use the trade
-      names, trademarks, service marks, or product names of the Licensor,
-      except as required for reasonable and customary use in describing the
-      origin of the Work and reproducing the content of the NOTICE file.
-
-   7. Disclaimer of Warranty. Unless required by applicable law or
-      agreed to in writing, Licensor provides the Work (and each
-      Contributor provides its Contributions) on an "AS IS" BASIS,
-      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
-      implied, including, without limitation, any warranties or conditions
-      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
-      PARTICULAR PURPOSE. You are solely responsible for determining the
-      appropriateness of using or redistributing the Work and assume any
-      risks associated with Your exercise of permissions under this License.
-
-   8. Limitation of Liability. In no event and under no legal theory,
-      whether in tort (including negligence), contract, or otherwise,
-      unless required by applicable law (such as deliberate and grossly
-      negligent acts) or agreed to in writing, shall any Contributor be
-      liable to You for damages, including any direct, indirect, special,
-      incidental, or consequential damages of any character arising as a
-      result of this License or out of the use or inability to use the
-      Work (including but not limited to damages for loss of goodwill,
-      work stoppage, computer failure or malfunction, or any and all
-      other commercial damages or losses), even if such Contributor
-      has been advised of the possibility of such damages.
-
-   9. Accepting Warranty or Additional Liability. While redistributing
-      the Work or Derivative Works thereof, You may choose to offer,
-      and charge a fee for, acceptance of support, warranty, indemnity,
-      or other liability obligations and/or rights consistent with this
-      License. However, in accepting such obligations, You may act only
-      on Your own behalf and on Your sole responsibility, not on behalf
-      of any other Contributor, and only if You agree to indemnify,
-      defend, and hold each Contributor harmless for any liability
-      incurred by, or claims asserted against, such Contributor by reason
-      of your accepting any such warranty or additional liability.
-
-   END OF TERMS AND CONDITIONS
-
-   APPENDIX: How to apply the Apache License to your work.
-
-      To apply the Apache License to your work, attach the following
-      boilerplate notice, with the fields enclosed by brackets "[]"
-      replaced with your own identifying information. (Don't include
-      the brackets!)  The text should be enclosed in the appropriate
-      comment syntax for the file format. We also recommend that a
-      file or class name and description of purpose be included on the
-      same "printed page" as the copyright notice for easier
-      identification within third-party archives.
-
-   Copyright 2023 Continue Dev, Inc.
-
-   Licensed under the Apache License, Version 2.0 (the "License");
-   you may not use this file except in compliance with the License.
-   You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.

src/services/continuedev/README.md

@@ -1,245 +0,0 @@
-# Continue: Autocomplete & NextEdit Library
-
-A focused TypeScript library extracted from [Continue](https://github.com/continuedev/continue) containing only the AI-powered autocomplete and NextEdit features. This library is integrated into the [Kilocode](https://github.com/kilocode/kilocode) monorepo as a service component.
-
-## Overview
-
-This library provides two core features from the Continue project:
-
-- **Autocomplete**: Intelligent, context-aware code completion powered by LLMs
-- **NextEdit**: Multi-location code edit predictions that understand your editing patterns
-
-All other Continue functionality (GUI, chat, agents, tools, etc.) has been removed to create a focused, reusable codebase.
-
-## Integration Context
-
-This library is part of the **Kilocode monorepo** at `src/services/continuedev/`. It contains pure TypeScript source code without independent build configuration:
-
-- **No package.json** - Dependencies managed by Kilocode's pnpm workspace
-- **No build config** - Uses Kilocode's TypeScript and build tooling
-- **Testing** - Integrated into Kilocode's vitest test suite
-- **Purpose** - Provides autocomplete and edit prediction capabilities to Kilocode
-
-For integration details, see [`INTEGRATION.md`](INTEGRATION.md).
-
-## Features
-
-### 🎯 Autocomplete
-
-- **Context-aware completions**: Analyzes surrounding code, imports, and recently edited files
-- **Multi-line support**: Generates complete code blocks, not just single lines
-- **Smart filtering**: Removes invalid completions using AST analysis and bracket matching
-- **Caching**: LRU cache for improved performance
-- **Debouncing**: Prevents excessive LLM calls during rapid typing
-- **Tree-sitter integration**: Accurate syntax-aware code analysis
-
-### ✨ NextEdit
-
-- **Predictive edits**: Suggests edits across multiple locations based on your changes
-- **Full-file and partial-file diffs**: Flexible edit region calculation
-- **Multiple model support**: Built-in support for Instinct and MercuryCoder models
-- **Visual feedback**: Jump navigation between edit regions
-- **Cursor positioning**: Intelligent cursor placement after edits
-
-### 🔧 Supporting Infrastructure
-
-- **Multiple LLM providers**: OpenAI, Anthropic, Gemini, Azure, Bedrock, and more
-- **Tree-sitter integration**: Accurate syntax-aware code analysis for multiple languages
-- **Comprehensive testing**: 857 tests covering autocomplete, NextEdit, and integrations
-- **TypeScript**: Full type safety and IntelliSense support
-
-## Library Structure
-
-```
-src/services/continuedev/
-├── core/                      # All autocomplete & NextEdit code
-│   ├── autocomplete/          # Autocomplete feature
-│   │   ├── CompletionProvider.ts
-│   │   ├── MinimalConfig.ts
-│   │   ├── context/          # Context gathering (tree-sitter based)
-│   │   ├── filtering/        # Bracket matching, stream transforms
-│   │   ├── generation/       # LLM completion streaming
-│   │   ├── postprocessing/   # Clean up completions
-│   │   ├── snippets/         # Code snippet retrieval
-│   │   └── templating/       # Prompt construction
-│   ├── nextEdit/             # NextEdit feature
-│   │   ├── NextEditProvider.ts
-│   │   ├── providers/        # Model-specific providers
-│   │   ├── context/          # Edit aggregation & context
-│   │   ├── diff/             # Diff calculation
-│   │   └── templating/       # NextEdit prompt engines
-│   ├── llm/                  # LLM integration
-│   │   ├── llms/             # Provider implementations
-│   │   └── openai-adapters/  # OpenAI-compatible adapters
-│   ├── diff/                 # Myers diff algorithm
-│   ├── util/                 # Shared utilities
-│   ├── indexing/             # Security checks & ignore patterns
-│   ├── fetch/                # HTTP client with cert support
-│   └── vscode-test-harness/  # VSCode integration example
-├── tree-sitter/              # Tree-sitter query files
-├── legacy_code_rewrite/      # Historical extraction documentation
-├── API_REFERENCE.md          # Complete API documentation
-├── ARCHITECTURE.md           # Technical architecture
-├── EXAMPLES.md               # Usage examples
-├── INTEGRATION.md            # Integration with Kilocode
-└── LICENSE                   # Apache 2.0 license
-```
-
-## Architecture
-
-### High-Level Architecture
-
-```
-┌─────────────────────────────────────────┐
-│         IDE Integration Layer           │
-│  (VSCode, JetBrains, or Custom IDE)     │
-└─────────────┬───────────────────────────┘
-              │
-              ├──────────────────┬─────────────────┐
-              │                  │                 │
-┌─────────────▼──────────┐  ┌───▼────────────┐  ┌▼─────────────┐
-│  CompletionProvider    │  │ NextEditProvider│  │ MinimalConfig│
-│  (Autocomplete)        │  │ (NextEdit)      │  │ Provider     │
-└────────┬───────────────┘  └────┬───────────┘  └──────────────┘
-         │                        │
-         │  ┌─────────────────────┤
-         │  │                     │
-    ┌────▼──▼────┐          ┌────▼──────────┐
-    │  LLM Layer │          │ Tree-sitter   │
-    │  (OpenAI,  │          │ (AST parsing) │
-    │   Ollama)  │          └───────────────┘
-    └────────────┘
-```
-
-### Core Components
-
-- **[`CompletionProvider`](core/autocomplete/CompletionProvider.ts)**: Main autocomplete engine
-- **[`NextEditProvider`](core/nextEdit/NextEditProvider.ts)**: NextEdit prediction engine
-- **[`MinimalConfigProvider`](core/autocomplete/MinimalConfig.ts)**: Configuration management
-- **IDE Interface**: Abstraction for editor integration
-- **ILLM Interface**: Abstraction for LLM providers
-
-## Documentation
-
-For detailed usage and API information:
-
-- **[`API_REFERENCE.md`](API_REFERENCE.md)** - Complete API documentation with method signatures and parameters
-- **[`EXAMPLES.md`](EXAMPLES.md)** - Practical code examples for common use cases
-- **[`ARCHITECTURE.md`](ARCHITECTURE.md)** - Technical architecture and design decisions
-- **[`INTEGRATION.md`](INTEGRATION.md)** - Integration with Kilocode monorepo
-
-The VSCode test harness at [`core/vscode-test-harness/`](core/vscode-test-harness/) provides a complete working integration example with 86 tests.
-
-## Current State
-
-### What's Included ✅
-
-- **Autocomplete**: Full tab autocomplete with context gathering, filtering, and LLM generation
-- **NextEdit**: Multi-location edit prediction with diff calculation
-- **LLM Integrations**: OpenAI, Anthropic, Gemini, Azure, Bedrock, and 15+ other providers
-- **Tree-sitter**: Multi-language syntax parsing for context extraction
-- **Test Harness**: VSCode integration example with 86 integration tests
-- **All Dependencies**: fetch, diff utilities, security checks, logging, analytics
-
-### What's Removed ❌
-
-- GUI/Webview interface
-- Chat functionality
-- Agent/tool system
-- CLI extension
-- IntelliJ extension
-- Documentation site
-- Media assets
-- Deployment scripts
-- Complex YAML configuration (replaced with minimal config)
-- Package monorepo structure (consolidated to single root)
-
-### Statistics
-
-- **857 passing tests** (autocomplete, NextEdit, integrations, dependencies)
-- **TypeScript compiles cleanly** (zero type errors)
-- **~50,000 lines of code** (down from ~112,000 - 55% reduction)
-- **Single test framework** (Vitest only, Jest removed)
-- **Consolidated structure** (all code in `core/`, no separate packages)
-
-## Testing
-
-Tests for this library are integrated into Kilocode's test suite. See [`INTEGRATION.md`](INTEGRATION.md) for details on running tests within the Kilocode project.
-
-The library includes comprehensive test coverage:
-
-- **Autocomplete tests**: Context gathering, filtering, generation, templating, caching
-- **NextEdit tests**: Edit prediction, diff calculation, template engines, history tracking
-- **Diff tests**: Myers algorithm, streaming diffs, line matching
-- **Integration tests**: VSCode test harness with real-world usage scenarios
-- **Dependency tests**: LRU cache, tree-sitter parsing, security filtering
-
-## Integration into Your IDE
-
-To integrate this library into your own IDE:
-
-1. Implement the [`IDE` interface](core/index.d.ts)
-2. Create [`CompletionProvider`](core/autocomplete/CompletionProvider.ts) instance
-3. Create [`NextEditProvider`](core/nextEdit/NextEditProvider.ts) instance (optional)
-4. See [`core/vscode-test-harness/`](core/vscode-test-harness/) for a complete VSCode example
-
-## License & Credits
-
-This library is extracted from [Continue](https://github.com/continuedev/continue), an open-source AI code assistant.
-
-**Original Project**: https://github.com/continuedev/continue  
-**Original Authors**: Continue Dev, Inc  
-**License**: Apache-2.0
-
-### Attribution
-
-The autocomplete and NextEdit functionality in this library was developed by the Continue team. This extraction preserves the original code structure and functionality while providing a minimal, reusable library.
-
-Key contributors to the original Continue project:
-
-- The Continue team and community
-- See the original repository for full contributor list
-
-### Changes in This Version
-
-This version removes everything except autocomplete and NextEdit:
-
-- ❌ **Removed**: GUI, chat interface, agents, tools, CLI, IntelliJ extension
-- ❌ **Removed**: Documentation site, media files, deployment scripts
-- ❌ **Removed**: Complex YAML config system (replaced with minimal config)
-- ❌ **Removed**: Package monorepo structure (consolidated into single root)
-- ✅ **Retained**: All autocomplete functionality with comprehensive test coverage
-- ✅ **Retained**: NextEdit feature with full test coverage
-- ✅ **Retained**: LLM integrations (OpenAI, Anthropic, Gemini, etc.)
-- ✅ **Retained**: Tree-sitter parsing and context gathering
-
-## Documentation
-
-- **[`README.md`](README.md)** - This file - Overview and integration
-- **[`INTEGRATION.md`](INTEGRATION.md)** - Integration with Kilocode monorepo
-- **[`ARCHITECTURE.md`](ARCHITECTURE.md)** - Technical architecture details
-- **[`API_REFERENCE.md`](API_REFERENCE.md)** - Complete API documentation
-- **[`EXAMPLES.md`](EXAMPLES.md)** - Comprehensive usage examples
-- **[`legacy_code_rewrite/`](legacy_code_rewrite/)** - Historical extraction documentation (49 files)
-
-## Links
-
-- **Kilocode Project**: https://github.com/kilocode/kilocode
-- **Original Continue Project**: https://github.com/continuedev/continue
-- **Continue Documentation**: https://docs.continue.dev
-- **Continue Discord**: https://discord.gg/continue
-
-## Support
-
-For questions about this library:
-
-- Check the [`ARCHITECTURE.md`](ARCHITECTURE.md) for technical details
-- Review [`EXAMPLES.md`](EXAMPLES.md) for usage patterns
-- Examine the test harness in [`core/vscode-test-harness/`](core/vscode-test-harness/)
-- See [`INTEGRATION.md`](INTEGRATION.md) for Kilocode integration details
-
-For questions about the original Continue project:
-
-- Visit https://docs.continue.dev
-- Join the Discord: https://discord.gg/continue
-- Open an issue: https://github.com/continuedev/continue/issues

src/services/continuedev/core/autocomplete/context/root-path-context/__fixtures__/files/typescript/classMethods.ts

@@ -1,35 +0,0 @@
-// @ts-nocheck
-
-class Group {
-  getPersonAddress(person: Person): Address {
-    // TODO
-  }
-
-  getHardcodedAddress(): Address {
-    // TODO
-  }
-
-  addPerson(person: Person) {
-    // TODO
-  }
-
-  addPeople(people: Person[]) {
-    // TODO
-  }
-
-  getAddresses(people: Person[]): Address[] {
-    // TODO
-  }
-
-  logPersonWithAddress(person: Person<Address>): Person<Address> {
-    // TODO
-  }
-
-  logPersonOrAddress(person: Person | Address): Person | Address {
-    // TODO
-  }
-
-  logPersonAndAddress(person: Person, address: Address) {
-    // TODO
-  }
-}

src/services/continuedev/core/diff/test-examples/README.md

@@ -1,23 +0,0 @@
-# Diff algorithm tests
-
-Tests are specified as
-
-```
-<CODE BEFORE>
-
----
-
-<CODE AFTER>
-
----
-
-<EXPECTED DIFF>
-```
-
-`---` is the delimeter, and surrounding whitespace will be trimmed.
-
-The expected diff can be generated with the `displayDiff` function.
-
-We make this explicit instead of comparing to the output of `myersDiff` in case the output from that is either unattainable or not exactly what we want.
-
-In order to generate the expected diff, you can first leave it empty and then run the test. The test will catch this and write the _computed_ diff to the test file. It is up to you to correct this to the expected diff.

src/services/continuedev/core/indexing/README.md

@@ -1,30 +0,0 @@
-# Indexing
-
-Continue uses a tagging system along with content addressing to ensure that nothing needs to be indexed twice. When you change branches, Continue will only re-index the files that are newly modified and that we don't already have a copy of. This system can be used across many different "artifacts" just by implementing the `CodebaseIndex` class.
-
-_artifact_: something that is generated by indexing and then saved to be used later (e.g. emeddings, full-text search index, or a table of top-level code snippets in each file)
-
-_cacheKey_: a key that determines whether two files can be considered the same to avoid re-indexing (always hash of file contents at this point)
-
-_`CodebaseIndex`_: a class that makes it easy to use the indexing system to help you generate a new artifact
-
-The indexing process does the following:
-
-1. Check the modified timestamps of all files in the repo (this may seem extreme, but checking timestamps is significantly faster than actually reading a file. Git does the same thing.)
-2. Compare these to a "catalog" (stored in SQLite) of the last time that we indexed each of these files to get a list of files to "add" or "remove". If the file exists in the repo but not in the catalog, then we must "add" the file. If it exists in the catalog but not the repo, we must "remove" the file. If it exists in both and was modified after last indexed, then we must update the file. In this case we also add it to the "add" list.
-3. For each file to "add", check whether it was indexed on another branch. Here we use a SQLite table that acts as a cache for indexed files. If we find an entry in this table for a file with the same cacheKey, then we only need to add a tag to this entry for the current branch ("addTag"). Otherwise, we must "compute" the artifact.
-4. For each file in "remove", check whether it was indexed on another branch. If we find only one entry with the same cacheKey (presumably this should be the entry for the current branch, or something has gone wrong), then this entry should be removed and there will be no more branches that need the artifact, so we want to "delete" it. If there is more than one tag on this artifact, then we should just remove the tag for this branch ("removeTag").
-5. After having calculated these four lists of files ("compute", "delete", "addTag", "removeTag"), we pass them to the `CodebaseIndex` so that it can update whatever index-specific storage it might have. Many of them use SQLite and/or LanceDB. The `CodebaseIndex` implements a method called "update" that accepts the four lists and yields progress updates as it iterates over the lists. These progress updates are used to officially mark a file as having been indexed, so that if the extension is closed mid-indexing we don't falsely record progress.
-
-## Existing `CodebaseIndex`es
-
-All indexes must be returned by `getIndexesToBuild` in [`CodebaseIndexer.ts`](./CodebaseIndexer.ts) if they are to be used.
-
-`CodeSnippetsCodebaseIndex`: uses tree-sitter queries to get a list of functions, classes, and other top-level code objects in each file
-`FullTextSearchCodebaseIndex`: creates a full-text search index using SQLite FTS5
-`ChunkCodebaseIndex`: chunks files recursively by code structure, for use in other embeddings providers like `LanceDbIndex`
-`LanceDbIndex`: calculates embeddings for each chunk and adds them to the LanceDB vector database, with metadata going into SQLite. Note that for each branch, a unique table is created in LanceDB.
-
-## Known problems
-
-- `FullTextSearchCodebaseIndex` doesn't differentiate between tags (branch, repo), so results may come from any branch/repo. LanceDB does this by creating separate tables for each tag (see `tableNameForTag`). The chunk index does this with a second table

src/services/ghost/GhostJetbrainsBridge.ts

@@ -4,7 +4,7 @@ import { z } from "zod"
 import { GhostServiceManager } from "./GhostServiceManager"
 import { ClineProvider } from "../../core/webview/ClineProvider"
 import { getKiloCodeWrapperProperties } from "../../core/kilocode/wrapper"
-import { languageForFilepath } from "../continuedev/core/autocomplete/constants/AutocompleteLanguageInfo"
+import { languageForFilepath } from "./continuedev/core/autocomplete/constants/AutocompleteLanguageInfo"
 import { GhostContextProvider } from "./types"
 import { FimPromptBuilder } from "./classic-auto-complete/FillInTheMiddle"
 import { HoleFiller } from "./classic-auto-complete/HoleFiller"

src/services/ghost/chat-autocomplete/ChatTextAreaAutocomplete.ts

@@ -2,7 +2,7 @@ import * as vscode from "vscode"
 import { GhostModel } from "../GhostModel"
 import { ProviderSettingsManager } from "../../../core/config/ProviderSettingsManager"
 import { AutocompleteContext, VisibleCodeContext } from "../types"
-import { removePrefixOverlap } from "../../continuedev/core/autocomplete/postprocessing/removePrefixOverlap.js"
+import { removePrefixOverlap } from "../continuedev/core/autocomplete/postprocessing/removePrefixOverlap.js"
 import { AutocompleteTelemetry } from "../classic-auto-complete/AutocompleteTelemetry"
 import { postprocessGhostSuggestion } from "../classic-auto-complete/uselessSuggestionFilter"
 

src/services/ghost/classic-auto-complete/FillInTheMiddle.ts

@@ -6,7 +6,7 @@ import {
 	FillInAtCursorSuggestion,
 } from "../types"
 import { getProcessedSnippets } from "./getProcessedSnippets"
-import { getTemplateForModel } from "../../continuedev/core/autocomplete/templating/AutocompleteTemplate"
+import { getTemplateForModel } from "../continuedev/core/autocomplete/templating/AutocompleteTemplate"
 import { GhostModel } from "../GhostModel"
 
 export type { FimGhostPrompt, FimCompletionResult }

src/services/ghost/classic-auto-complete/GhostInlineCompletionProvider.ts

@@ -16,10 +16,10 @@ import {
 import { HoleFiller } from "./HoleFiller"
 import { FimPromptBuilder } from "./FillInTheMiddle"
 import { GhostModel } from "../GhostModel"
-import { ContextRetrievalService } from "../../continuedev/core/autocomplete/context/ContextRetrievalService"
-import { VsCodeIde } from "../../continuedev/core/vscode-test-harness/src/VSCodeIde"
-import { RecentlyVisitedRangesService } from "../../continuedev/core/vscode-test-harness/src/autocomplete/RecentlyVisitedRangesService"
-import { RecentlyEditedTracker } from "../../continuedev/core/vscode-test-harness/src/autocomplete/recentlyEdited"
+import { ContextRetrievalService } from "../continuedev/core/autocomplete/context/ContextRetrievalService"
+import { VsCodeIde } from "../continuedev/core/vscode-test-harness/src/VSCodeIde"
+import { RecentlyVisitedRangesService } from "../continuedev/core/vscode-test-harness/src/autocomplete/RecentlyVisitedRangesService"
+import { RecentlyEditedTracker } from "../continuedev/core/vscode-test-harness/src/autocomplete/recentlyEdited"
 import type { GhostServiceSettings } from "@roo-code/types"
 import { postprocessGhostSuggestion } from "./uselessSuggestionFilter"
 import { shouldSkipAutocomplete } from "./contextualSkip"

src/services/ghost/classic-auto-complete/HoleFiller.ts

@@ -6,7 +6,7 @@ import {
 	ChatCompletionResult,
 } from "../types"
 import { getProcessedSnippets } from "./getProcessedSnippets"
-import { formatSnippets } from "../../continuedev/core/autocomplete/templating/formatting"
+import { formatSnippets } from "../continuedev/core/autocomplete/templating/formatting"
 import { GhostModel } from "../GhostModel"
 import { ApiStreamChunk } from "../../../api/transform/stream"
 

src/services/ghost/classic-auto-complete/__tests__/GhostContextProvider.test.ts

@@ -1,12 +1,12 @@
 import { describe, it, expect, beforeEach, vi } from "vitest"
 import { getProcessedSnippets } from "../getProcessedSnippets"
 import { AutocompleteInput, GhostContextProvider } from "../../types"
-import { AutocompleteSnippetType } from "../../../continuedev/core/autocomplete/types"
+import { AutocompleteSnippetType } from "../../continuedev/core/autocomplete/types"
 import { GhostModel } from "../../GhostModel"
 import { RooIgnoreController } from "../../../../core/ignore/RooIgnoreController"
 import crypto from "crypto"
-import { ContextRetrievalService } from "../../../continuedev/core/autocomplete/context/ContextRetrievalService"
-import { VsCodeIde } from "../../../continuedev/core/vscode-test-harness/src/VSCodeIde"
+import { ContextRetrievalService } from "../../continuedev/core/autocomplete/context/ContextRetrievalService"
+import { VsCodeIde } from "../../continuedev/core/vscode-test-harness/src/VSCodeIde"
 
 vi.mock("vscode", () => ({
 	Uri: {
@@ -28,19 +28,19 @@ vi.mock("vscode", () => ({
 	},
 }))
 
-vi.mock("../../../continuedev/core/autocomplete/context/ContextRetrievalService", () => ({
+vi.mock("../../continuedev/core/autocomplete/context/ContextRetrievalService", () => ({
 	ContextRetrievalService: vi.fn().mockImplementation(() => ({
 		initializeForFile: vi.fn().mockResolvedValue(undefined),
 	})),
 }))
 
-vi.mock("../../../continuedev/core/vscode-test-harness/src/VSCodeIde", () => ({
+vi.mock("../../continuedev/core/vscode-test-harness/src/VSCodeIde", () => ({
 	VsCodeIde: vi.fn().mockImplementation(() => ({
 		getWorkspaceDirs: vi.fn().mockResolvedValue(["file:///workspace"]),
 	})),
 }))
 
-vi.mock("../../../continuedev/core/autocomplete/util/HelperVars", () => ({
+vi.mock("../../continuedev/core/autocomplete/util/HelperVars", () => ({
 	HelperVars: {
 		create: vi.fn().mockResolvedValue({
 			filepath: "file:///test.ts",
@@ -49,7 +49,7 @@ vi.mock("../../../continuedev/core/autocomplete/util/HelperVars", () => ({
 	},
 }))
 
-vi.mock("../../../continuedev/core/autocomplete/snippets/getAllSnippets", () => ({
+vi.mock("../../continuedev/core/autocomplete/snippets/getAllSnippets", () => ({
 	getAllSnippetsWithoutRace: vi.fn().mockResolvedValue({
 		recentlyOpenedFileSnippets: [],
 		importDefinitionSnippets: [],
@@ -63,7 +63,7 @@ vi.mock("../../../continuedev/core/autocomplete/snippets/getAllSnippets", () =>
 	}),
 }))
 
-vi.mock("../../../continuedev/core/autocomplete/templating/filtering", () => ({
+vi.mock("../../continuedev/core/autocomplete/templating/filtering", () => ({
 	getSnippets: vi
 		.fn()
 		.mockImplementation((_helper, payload) => [
@@ -126,7 +126,7 @@ describe("GhostContextProvider", () => {
 
 		it("should return processed snippets when snippets are available", async () => {
 			const { getAllSnippetsWithoutRace } = await import(
-				"../../../continuedev/core/autocomplete/snippets/getAllSnippets"
+				"../../continuedev/core/autocomplete/snippets/getAllSnippets"
 			)
 
 			;(getAllSnippetsWithoutRace as any).mockResolvedValueOnce({
@@ -167,7 +167,7 @@ describe("GhostContextProvider", () => {
 
 		it("should process multiple snippets correctly", async () => {
 			const { getAllSnippetsWithoutRace } = await import(
-				"../../../continuedev/core/autocomplete/snippets/getAllSnippets"
+				"../../continuedev/core/autocomplete/snippets/getAllSnippets"
 			)
 
 			;(getAllSnippetsWithoutRace as any).mockResolvedValueOnce({
@@ -219,7 +219,7 @@ describe("GhostContextProvider", () => {
 
 		it("should propagate errors from getAllSnippetsWithoutRace", async () => {
 			const { getAllSnippetsWithoutRace } = await import(
-				"../../../continuedev/core/autocomplete/snippets/getAllSnippets"
+				"../../continuedev/core/autocomplete/snippets/getAllSnippets"
 			)
 
 			;(getAllSnippetsWithoutRace as any).mockRejectedValueOnce(new Error("Test error"))
@@ -264,7 +264,7 @@ describe("GhostContextProvider", () => {
 
 		it("should filter out blocked files", async () => {
 			const { getAllSnippetsWithoutRace } = await import(
-				"../../../continuedev/core/autocomplete/snippets/getAllSnippets"
+				"../../continuedev/core/autocomplete/snippets/getAllSnippets"
 			)
 
 			// Mock validateAccess to block /blocked.ts
@@ -317,7 +317,7 @@ describe("GhostContextProvider", () => {
 
 		it("should keep snippets without file paths", async () => {
 			const { getAllSnippetsWithoutRace } = await import(
-				"../../../continuedev/core/autocomplete/snippets/getAllSnippets"
+				"../../continuedev/core/autocomplete/snippets/getAllSnippets"
 			)
 
 			const controller = await mockIgnoreController!
@@ -351,7 +351,7 @@ describe("GhostContextProvider", () => {
 				staticSnippet: [],
 			})
 
-			const { getSnippets } = await import("../../../continuedev/core/autocomplete/templating/filtering")
+			const { getSnippets } = await import("../../continuedev/core/autocomplete/templating/filtering")
 			;(getSnippets as any).mockImplementation((_helper: any, payload: any) => [
 				...payload.recentlyOpenedFileSnippets,
 				...payload.diffSnippets,
@@ -392,7 +392,7 @@ describe("GhostContextProvider", () => {
 			}
 
 			const { getAllSnippetsWithoutRace } = await import(
-				"../../../continuedev/core/autocomplete/snippets/getAllSnippets"
+				"../../continuedev/core/autocomplete/snippets/getAllSnippets"
 			)
 
 			;(getAllSnippetsWithoutRace as any).mockResolvedValueOnce({

src/services/ghost/classic-auto-complete/__tests__/HoleFiller.test.ts

@@ -2,7 +2,7 @@ import { describe, it, expect, beforeEach, vi } from "vitest"
 import { HoleFiller, parseGhostResponse } from "../HoleFiller"
 import { AutocompleteInput, GhostContextProvider } from "../../types"
 import crypto from "crypto"
-import { AutocompleteSnippetType } from "../../../continuedev/core/autocomplete/types"
+import { AutocompleteSnippetType } from "../../continuedev/core/autocomplete/types"
 
 // Mock the getProcessedSnippets module
 vi.mock("../getProcessedSnippets", () => ({

src/services/ghost/classic-auto-complete/getProcessedSnippets.ts

@@ -1,15 +1,15 @@
 import * as vscode from "vscode"
-import { ContextRetrievalService } from "../../continuedev/core/autocomplete/context/ContextRetrievalService"
-import { VsCodeIde } from "../../continuedev/core/vscode-test-harness/src/VSCodeIde"
+import { ContextRetrievalService } from "../continuedev/core/autocomplete/context/ContextRetrievalService"
+import { VsCodeIde } from "../continuedev/core/vscode-test-harness/src/VSCodeIde"
 import { AutocompleteInput } from "../types"
-import { HelperVars } from "../../continuedev/core/autocomplete/util/HelperVars"
-import { getAllSnippetsWithoutRace } from "../../continuedev/core/autocomplete/snippets/getAllSnippets"
-import { getDefinitionsFromLsp } from "../../continuedev/core/vscode-test-harness/src/autocomplete/lsp"
-import { DEFAULT_AUTOCOMPLETE_OPTS } from "../../continuedev/core/util/parameters"
-import { getSnippets } from "../../continuedev/core/autocomplete/templating/filtering"
+import { HelperVars } from "../continuedev/core/autocomplete/util/HelperVars"
+import { getAllSnippetsWithoutRace } from "../continuedev/core/autocomplete/snippets/getAllSnippets"
+import { getDefinitionsFromLsp } from "../continuedev/core/vscode-test-harness/src/autocomplete/lsp"
+import { DEFAULT_AUTOCOMPLETE_OPTS } from "../continuedev/core/util/parameters"
+import { getSnippets } from "../continuedev/core/autocomplete/templating/filtering"
 import { GhostModel } from "../GhostModel"
 import { RooIgnoreController } from "../../../core/ignore/RooIgnoreController"
-import { AutocompleteSnippet, AutocompleteSnippetType } from "../../continuedev/core/autocomplete/types"
+import { AutocompleteSnippet, AutocompleteSnippetType } from "../continuedev/core/autocomplete/types"
 
 function uriToFsPath(filepath: string): string {
 	if (filepath.startsWith("file://")) {

src/services/ghost/classic-auto-complete/uselessSuggestionFilter.ts

@@ -1,4 +1,4 @@
-import { postprocessCompletion } from "../../continuedev/core/autocomplete/postprocessing/index.js"
+import { postprocessCompletion } from "../continuedev/core/autocomplete/postprocessing/index.js"
 import { applyLanguageFilter } from "./language-filters"
 
 export type AutocompleteSuggestion = {

src/services/ghost/context/VisibleCodeTracker.ts

@@ -11,7 +11,7 @@
 import * as vscode from "vscode"
 
 import { toRelativePath } from "../../../utils/path"
-import { isSecurityConcern } from "../../continuedev/core/indexing/ignore"
+import { isSecurityConcern } from "../continuedev/core/indexing/ignore"
 import type { RooIgnoreController } from "../../../core/ignore/RooIgnoreController"
 
 import { VisibleCodeContext, VisibleEditorInfo, VisibleRange, DiffInfo } from "../types"

src/services/ghost/context/__tests__/VisibleCodeTracker.spec.ts

@@ -10,7 +10,7 @@ vi.mock("vscode", () => ({
 	},
 }))
 
-vi.mock("../../../../services/continuedev/core/indexing/ignore", () => ({
+vi.mock("../../../../services/ghost/continuedev/core/indexing/ignore", () => ({
 	isSecurityConcern: vi.fn((filePath: string) => {
 		return filePath.includes(".env") || filePath.includes("credentials")
 	}),

src/services/continuedev/core/autocomplete/context/root-path-context/__fixtures__/files/typescript/arrowFunctions.ts → src/services/ghost/continuedev/core/autocomplete/context/root-path-context/__fixtures__/files/typescript/arrowFunctions.ts

@@ -1,29 +1,29 @@
 // @ts-nocheck
 
 const getAddress = (person: Person): Address => {
-  // TODO
-};
+	// TODO
+}
 
 const logPerson = (person: Person) => {
-  // TODO
-};
+	// TODO
+}
 
 const getHardcodedAddress = (): Address => {
-  // TODO
-};
+	// TODO
+}
 
 const getAddresses = (people: Person[]): Address[] => {
-  // TODO
-};
+	// TODO
+}
 
 const logPersonWithAddres = (person: Person<Address>): Person<Address> => {
-  // TODO
-};
+	// TODO
+}
 
 const logPersonOrAddress = (person: Person | Address): Person | Address => {
-  // TODO
-};
+	// TODO
+}
 
 const logPersonAndAddress = (person: Person, address: Address) => {
-  // TODO
-};
+	// TODO
+}

src/services/ghost/continuedev/core/autocomplete/context/root-path-context/__fixtures__/files/typescript/classMethods.ts

@@ -0,0 +1,35 @@
+// @ts-nocheck
+
+class Group {
+	getPersonAddress(person: Person): Address {
+		// TODO
+	}
+
+	getHardcodedAddress(): Address {
+		// TODO
+	}
+
+	addPerson(person: Person) {
+		// TODO
+	}
+
+	addPeople(people: Person[]) {
+		// TODO
+	}
+
+	getAddresses(people: Person[]): Address[] {
+		// TODO
+	}
+
+	logPersonWithAddress(person: Person<Address>): Person<Address> {
+		// TODO
+	}
+
+	logPersonOrAddress(person: Person | Address): Person | Address {
+		// TODO
+	}
+
+	logPersonAndAddress(person: Person, address: Address) {
+		// TODO
+	}
+}

src/services/continuedev/core/autocomplete/context/root-path-context/__fixtures__/files/typescript/functions.ts → src/services/ghost/continuedev/core/autocomplete/context/root-path-context/__fixtures__/files/typescript/functions.ts

@@ -1,33 +1,33 @@
 // @ts-nocheck
 
 function getAddress(person: Person): Address {
-  // TODO
+	// TODO
 }
 
 function getFirstAddress(people: Person[]): Address {
-  // TODO
+	// TODO
 }
 
 function logPerson(person: Person) {
-  // TODO
+	// TODO
 }
 
 function getHardcodedAddress(): Address {
-  // TODO
+	// TODO
 }
 
 function getAddresses(people: Person[]): Address[] {
-  // TODO
+	// TODO
 }
 
 function logPersonWithAddress(person: Person<Address>): Person<Address> {
-  // TODO
+	// TODO
 }
 
 function logPersonOrAddress(person: Person | Address): Person | Address {
-  // TODO
+	// TODO
 }
 
 function logPersonAndAddress(person: Person, address: Address) {
-  // TODO
+	// TODO
 }

src/services/continuedev/core/autocomplete/context/root-path-context/__fixtures__/files/typescript/generators.ts → src/services/ghost/continuedev/core/autocomplete/context/root-path-context/__fixtures__/files/typescript/generators.ts

@@ -1,33 +1,33 @@
 // @ts-nocheck
 
 function* getAddress(person: Person): Address {
-  // TODO
+	// TODO
 }
 
 function* getFirstAddress(people: Person[]): Address {
-  // TODO
+	// TODO
 }
 
 function* logPerson(person: Person) {
-  // TODO
+	// TODO
 }
 
 function* getHardcodedAddress(): Address {
-  // TODO
+	// TODO
 }
 
 function* getAddresses(people: Person[]): Address[] {
-  // TODO
+	// TODO
 }
 
 function* logPersonWithAddress(person: Person<Address>): Person<Address> {
-  // TODO
+	// TODO
 }
 
 function* logPersonOrAddress(person: Person | Address): Person | Address {
-  // TODO
+	// TODO
 }
 
 function* logPersonAndAddress(person: Person, address: Address) {
-  // TODO
+	// TODO
 }

src/services/continuedev/core/autocomplete/context/root-path-context/__test-cases__/typescript.ts → src/services/ghost/continuedev/core/autocomplete/context/root-path-context/__test-cases__/typescript.ts

@@ -235,7 +235,7 @@ const ARROW_FUNCTIONS = [
 		nodeType: "arrow_function with two arguments",
 		fileName: "typescript/arrowFunctions.ts",
 		language: "TypeScript",
-		cursorPosition: { line: 27, character: 11 },
+		cursorPosition: { line: 27, character: 7 },
 		definitionPositions: [
 			{ row: 26, column: 43 }, // Person
 			{ row: 26, column: 61 }, // Address
@@ -248,81 +248,81 @@ const CLASS_METHODS = [
 		nodeType: "method_declaration with a param and a return type",
 		fileName: "typescript/classMethods.ts",
 		language: "TypeScript",
-		cursorPosition: { line: 4, character: 11 },
+		cursorPosition: { line: 4, character: 8 },
 		definitionPositions: [
-			{ row: 3, column: 33 }, // Person
-			{ row: 3, column: 43 }, // Address
+			{ row: 3, column: 32 }, // Person
+			{ row: 3, column: 42 }, // Address
 		],
 	},
 	{
 		nodeType: "method_declaration without arguments",
 		fileName: "typescript/classMethods.ts",
 		language: "TypeScript",
-		cursorPosition: { line: 8, character: 11 },
+		cursorPosition: { line: 8, character: 8 },
 		definitionPositions: [
-			{ row: 7, column: 32 }, // Address
+			{ row: 7, column: 31 }, // Address
 		],
 	},
 	{
 		nodeType: "method_declaration without return type",
 		fileName: "typescript/classMethods.ts",
 		language: "TypeScript",
-		cursorPosition: { line: 12, character: 11 },
+		cursorPosition: { line: 12, character: 8 },
 		definitionPositions: [
-			{ row: 11, column: 26 }, // Person
+			{ row: 11, column: 25 }, // Person
 		],
 	},
 	{
 		nodeType: "method_declaration with array type arguments",
 		fileName: "typescript/classMethods.ts",
 		language: "TypeScript",
-		cursorPosition: { line: 16, character: 11 },
+		cursorPosition: { line: 16, character: 8 },
 		definitionPositions: [
-			{ row: 15, column: 26 }, // Person
+			{ row: 15, column: 25 }, // Person
 		],
 	},
 	{
 		nodeType: "method_declaration with array type arguments and array type return",
 		fileName: "typescript/classMethods.ts",
 		language: "TypeScript",
-		cursorPosition: { line: 20, character: 11 },
+		cursorPosition: { line: 20, character: 8 },
 		definitionPositions: [
-			{ row: 19, column: 29 }, // Person
-			{ row: 19, column: 41 }, // Address
+			{ row: 19, column: 28 }, // Person
+			{ row: 19, column: 40 }, // Address
 		],
 	},
 	{
 		nodeType: "method_declaration with with generic params and generic return type",
 		fileName: "typescript/classMethods.ts",
 		language: "TypeScript",
-		cursorPosition: { line: 24, character: 11 },
+		cursorPosition: { line: 24, character: 8 },
 		definitionPositions: [
-			{ row: 23, column: 37 }, // Person
-			{ row: 23, column: 45 }, // Address
-			{ row: 23, column: 55 }, // Person
-			{ row: 23, column: 63 }, // Address
+			{ row: 23, column: 36 }, // Person
+			{ row: 23, column: 44 }, // Address
+			{ row: 23, column: 54 }, // Person
+			{ row: 23, column: 62 }, // Address
 		],
 	},
 	{
 		nodeType: "method_declaration with union type params and union return type",
 		fileName: "typescript/classMethods.ts",
 		language: "TypeScript",
-		cursorPosition: { line: 28, character: 11 },
+		cursorPosition: { line: 28, character: 8 },
 		definitionPositions: [
-			{ row: 27, column: 35 }, // Person
-			{ row: 27, column: 45 }, // Address
-			{ row: 27, column: 54 }, // Person
-			{ row: 27, column: 64 }, // Address
+			{ row: 27, column: 34 }, // Person
+			{ row: 27, column: 44 }, // Address
+			{ row: 27, column: 53 }, // Person
+			{ row: 27, column: 63 }, // Address
 		],
 	},
 	{
 		nodeType: "method_declaration with two arguments",
 		fileName: "typescript/classMethods.ts",
 		language: "TypeScript",
-		cursorPosition: { line: 32, character: 11 },
+		cursorPosition: { line: 32, character: 8 },
 		definitionPositions: [
-			{ row: 31, column: 36 }, // Person
-			{ row: 31, column: 54 }, // Address
+			{ row: 31, column: 35 }, // Person
+			{ row: 31, column: 53 }, // Address
 		],
 	},
 ]