Skip to content

Commit

Permalink
rename intellij to jetbrains
Browse files Browse the repository at this point in the history
  • Loading branch information
sestinj committed Aug 19, 2024
1 parent f618f9d commit d4e7372
Show file tree
Hide file tree
Showing 7 changed files with 29 additions and 29 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ When merging to `preview`:
- the VS Code extension along with Rust extension is built and uploaded as an artifact
- all of the artifacts are downloaded and pushed to the store/registry all at once, as full releases.
- the version is bumped and this change is commited to preview
- in the future, the Intellij extension will be built and uploaded to the marketplace here
- in the future, the JetBrains extension will be built and uploaded to the marketplace here

## main

Expand All @@ -16,4 +16,4 @@ When merging to `main`:
- the VS Code extension along with Rust extension is built and uploaded as an artifact
- all of the artifacts are downloaded and pushed to the store/registry all at once, as full releases.
- the version is bumped and this change is commited to main
- in the future, the Intellij extension will be built and uploaded to the marketplace here
- in the future, the JetBrains extension will be built and uploaded to the marketplace here
2 changes: 1 addition & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,4 @@
Separate changelogs are kept for each extension:

- [VS Code Extension](./extensions/vscode/CHANGELOG.md)
- [Intellij Extension](./extensions/intellij/CHANGELOG.md)
- [JetBrains Extension](./extensions/intellij/CHANGELOG.md)
2 changes: 1 addition & 1 deletion CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -152,7 +152,7 @@ Pre-requisite: You should use the Intellij IDE, which can be downloaded [here](h

##### Debugging

Continue's JetBrains extension shares much of the code with the VS Code extension by utilizing shared code in the `core` directory and packaging it in a binary in the `binary` directory. The Intellij extension (written in Kotlin) is then able to communicate over stdin/stdout in the [CoreMessenger.kt](./extensions/intellij/src/main/kotlin/com/github/continuedev/continueintellijextension/continue/CoreMessenger.kt) file.
Continue's JetBrains extension shares much of the code with the VS Code extension by utilizing shared code in the `core` directory and packaging it in a binary in the `binary` directory. The JetBrains extension (written in Kotlin) is then able to communicate over stdin/stdout in the [CoreMessenger.kt](./extensions/intellij/src/main/kotlin/com/github/continuedev/continueintellijextension/continue/CoreMessenger.kt) file.

For the sake of rapid development, it is also possible to configure this communication to happen over local TCP sockets:

Expand Down
4 changes: 2 additions & 2 deletions docs/docs/changelog.mdx
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
---
title: 📝 Changelog
description: Changelogs for the latest releases of the VSCode and IntelliJ extensions
description: Changelogs for the latest releases of the VSCode and JetBrains extensions
keywords: [changelog]
hide_table_of_contents: true
---

import VSCodeChangelog from "../../extensions/vscode/CHANGELOG.md";
import IntelliJChangelog from "../../extensions/intellij/CHANGELOG.md";

Below are the changelogs for the latest releases of the VSCode and IntelliJ extensions. Prior to 2024-07-02, the changelogs do not reflect all updates.
Below are the changelogs for the latest releases of the VSCode and JetBrains extensions. Prior to 2024-07-02, the changelogs do not reflect all updates.

import TOCInline from "@theme/TOCInline";

Expand Down
2 changes: 1 addition & 1 deletion docs/docs/troubleshooting.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ description: Troubleshooting while waiting for help during beta / alpha testing
keywords: [reload, delete, manually, logs, server, console]
---

The Continue VS Code extension is currently in beta, and the Intellij extension is in Alpha. If you are having trouble, please follow the steps below.
The Continue VS Code extension is currently in beta, and the JetBrains extension is in Alpha. If you are having trouble, please follow the steps below.

1. [Check the logs](#check-the-logs)
2. [Try the latest pre-release](#download-the-latest-pre-release)
Expand Down
11 changes: 7 additions & 4 deletions extensions/vscode/scripts/prepackage.js
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,7 @@ const exe = os === "win32" ? ".exe" : "";
execCmdSync("npm run build");
}

// Copy over the dist folder to the Intellij extension //
// Copy over the dist folder to the JetBrains extension //
const intellijExtensionWebviewPath = path.join(
"..",
"extensions",
Expand All @@ -114,7 +114,7 @@ const exe = os === "win32" ? ".exe" : "";
ncp("dist", intellijExtensionWebviewPath, (error) => {
if (error) {
console.warn(
"[error] Error copying React app build to Intellij extension: ",
"[error] Error copying React app build to JetBrains extension: ",
error,
);
reject(error);
Expand All @@ -136,7 +136,7 @@ const exe = os === "win32" ? ".exe" : "";
path.join(intellijExtensionWebviewPath, "onigasm.wasm"),
);

console.log("[info] Copied gui build to Intellij extension");
console.log("[info] Copied gui build to JetBrains extension");

// Then copy over the dist folder to the VSCode extension //
const vscodeGuiPath = path.join("../extensions/vscode/gui");
Expand Down Expand Up @@ -248,7 +248,10 @@ const exe = os === "win32" ? ".exe" : "";
"../../../core/llm/tiktokenWorkerPool.mjs",
];
for (const f of filesToCopy) {
fs.copyFileSync(path.join(__dirname, f), path.join(__dirname, "..", "out", path.basename(f)));
fs.copyFileSync(
path.join(__dirname, f),
path.join(__dirname, "..", "out", path.basename(f)),
);
console.log(`[info] Copied ${path.basename(f)}`);
}

Expand Down
33 changes: 15 additions & 18 deletions extensions/vscode/scripts/utils.js
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@ async function buildGui(isGhAction) {
execCmdSync("npm run build");
}

// Copy over the dist folder to the Intellij extension //
// Copy over the dist folder to the JetBrains extension //
const intellijExtensionWebviewPath = path.join(
"..",
"extensions",
Expand All @@ -98,7 +98,7 @@ async function buildGui(isGhAction) {
ncp("dist", intellijExtensionWebviewPath, (error) => {
if (error) {
console.warn(
"[error] Error copying React app build to Intellij extension: ",
"[error] Error copying React app build to JetBrains extension: ",
error,
);
reject(error);
Expand All @@ -120,7 +120,7 @@ async function buildGui(isGhAction) {
path.join(intellijExtensionWebviewPath, "onigasm.wasm"),
);

console.log("[info] Copied gui build to Intellij extension");
console.log("[info] Copied gui build to JetBrains extension");

// Then copy over the dist folder to the VSCode extension //
const vscodeGuiPath = path.join("../extensions/vscode/gui");
Expand Down Expand Up @@ -256,7 +256,7 @@ async function copyNodeModules() {
"@esbuild",
"@lancedb",
"@vscode/ripgrep",
"workerpool"
"workerpool",
];
fs.mkdirSync("out/node_modules", { recursive: true });

Expand Down Expand Up @@ -328,15 +328,13 @@ async function downloadEsbuildBinary(target) {
"win32-x64":
"https://registry.npmjs.org/@esbuild/win32-x64/-/win32-x64-0.17.19.tgz",
}[target];
execCmdSync(
`curl -L -o out/tmp/esbuild.tgz ${downloadUrl}`,
);
execCmdSync(`curl -L -o out/tmp/esbuild.tgz ${downloadUrl}`);
execCmdSync("cd out/tmp && tar -xvzf esbuild.tgz");
// Copy the installed package back to the current directory
let tmpPath = "out/tmp/package/bin";
let outPath = `out/node_modules/@esbuild/${target}/bin`;
if (target.startsWith("win")) {
tmpPath = 'out/tmp/package';
tmpPath = "out/tmp/package";
outPath = `out/node_modules/@esbuild/${target}`;
}

Expand All @@ -347,18 +345,15 @@ async function downloadEsbuildBinary(target) {
{ dereference: true },
(error) => {
if (error) {
console.error(
`[error] Error copying esbuild package`,
error,
);
console.error(`[error] Error copying esbuild package`, error);
reject(error);
} else {
resolve();
}
},
);
});
rimrafSync("out/tmp")
rimrafSync("out/tmp");
}

async function downloadSqliteBinary(target) {
Expand Down Expand Up @@ -408,7 +403,8 @@ async function copySqliteBinary() {
async function downloadRipgrepBinary(target) {
console.log("[info] Downloading pre-built ripgrep binary");
rimrafSync("node_modules/@vscode/ripgrep/bin");
fs.mkdirSync("node_modules/@vscode/ripgrep/bin", { recursive: true });4
fs.mkdirSync("node_modules/@vscode/ripgrep/bin", { recursive: true });
4;
const downloadUrl = {
"darwin-arm64":
"https://github.com/microsoft/ripgrep-prebuilt/releases/download/v13.0.0-10/ripgrep-v13.0.0-10-aarch64-apple-darwin.tar.gz",
Expand All @@ -424,8 +420,7 @@ async function downloadRipgrepBinary(target) {
"https://github.com/microsoft/ripgrep-prebuilt/releases/download/v13.0.0-10/ripgrep-v13.0.0-10-x86_64-pc-windows-msvc.zip",
}[target];


if(target.startsWith("win")) {
if (target.startsWith("win")) {
execCmdSync(
`curl -L -o node_modules/@vscode/ripgrep/bin/build.zip ${downloadUrl}`,
);
Expand All @@ -435,7 +430,9 @@ async function downloadRipgrepBinary(target) {
execCmdSync(
`curl -L -o node_modules/@vscode/ripgrep/bin/build.tar.gz ${downloadUrl}`,
);
execCmdSync("cd node_modules/@vscode/ripgrep/bin && tar -xvzf build.tar.gz");
execCmdSync(
"cd node_modules/@vscode/ripgrep/bin && tar -xvzf build.tar.gz",
);
fs.unlinkSync("node_modules/@vscode/ripgrep/bin/build.tar.gz");
}
}
Expand Down Expand Up @@ -512,5 +509,5 @@ module.exports = {
installNodeModuleInTempDirAndCopyToCurrent,
downloadSqliteBinary,
downloadRipgrepBinary,
copyTokenizers
copyTokenizers,
};

0 comments on commit d4e7372

Please sign in to comment.