Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions bazel-jdt-bridge/vscode-extension/package-lock.json

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

13 changes: 13 additions & 0 deletions bazel-jdt-bridge/vscode-extension/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -34,8 +34,21 @@
{
"command": "bazel-jdt.createProjectForPackage",
"title": "Bazel: Create Project for Package"
},
{
"command": "bazel-jdt.addDirectoryToProject",
"title": "Bazel: Add to Project"
}
],
"menus": {
"explorer/context": [
{
"command": "bazel-jdt.addDirectoryToProject",
"when": "explorerResourceIsFolder",
"group": "bazel-jdt@1"
}
]
},
"configuration": {
"title": "Bazel JDT Bridge",
"properties": {
Expand Down
50 changes: 50 additions & 0 deletions bazel-jdt-bridge/vscode-extension/src/bazelproject.ts
Original file line number Diff line number Diff line change
Expand Up @@ -116,6 +116,56 @@ export function parseBazelprojectContent(content: string): BazelProjectViewConfi
return config;
}

export function addDirectoryToBazelproject(
bazelprojectPath: string,
relativeDir: string
): 'added' | 'already-exists' | 'created' {
if (fs.existsSync(bazelprojectPath)) {
const content = fs.readFileSync(bazelprojectPath, 'utf-8');
const config = parseBazelprojectContent(content);
if (config.directories.includes(relativeDir)) {
return 'already-exists';
}
fs.writeFileSync(bazelprojectPath, insertDirectoryIntoContent(content, relativeDir), 'utf-8');
return 'added';
} else {
fs.writeFileSync(
bazelprojectPath,
`directories:\n ${relativeDir}\n\nderive_targets_from_directories: True\n`,
'utf-8'
);
return 'created';
}
}

function insertDirectoryIntoContent(content: string, dir: string): string {
const lines = content.split('\n');
let inDirectories = false;
let lastDirLineIdx = -1;

for (let i = 0; i < lines.length; i++) {
const trimmed = lines[i].trim();
if (trimmed === 'directories:') {
inDirectories = true;
lastDirLineIdx = i;
continue;
}
if (inDirectories) {
if (trimmed.length === 0 || trimmed.startsWith('#') || /^[a-z_]+:/i.test(trimmed)) {
break;
}
lastDirLineIdx = i;
}
}

if (lastDirLineIdx >= 0) {
lines.splice(lastDirLineIdx + 1, 0, ` ${dir}`);
} else {
lines.unshift('directories:', ` ${dir}`, '');
}
return lines.join('\n');
}

export function resolveScopePatterns(config: BazelProjectViewConfig): string[] {
const patterns: string[] = [];

Expand Down
32 changes: 31 additions & 1 deletion bazel-jdt-bridge/vscode-extension/src/commands.ts
Original file line number Diff line number Diff line change
@@ -1,7 +1,9 @@
import * as vscode from 'vscode';
import * as path from 'path';
import * as fs from 'fs';
import { getConfig } from './config';
import { runImportWizard } from './importWizard';
import { parseBazelprojectFile } from './bazelproject';
import { parseBazelprojectFile, addDirectoryToBazelproject } from './bazelproject';

export function registerImportCommand(context: vscode.ExtensionContext) {
const workspaceRoot = vscode.workspace.workspaceFolders?.[0]?.uri.fsPath || '';
Expand Down Expand Up @@ -44,6 +46,34 @@ export function registerImportCommand(context: vscode.ExtensionContext) {
);
}

export function registerAddDirectoryCommand(context: vscode.ExtensionContext, workspaceRoot: string) {
context.subscriptions.push(
vscode.commands.registerCommand('bazel-jdt.addDirectoryToProject', async (uri: vscode.Uri) => {
if (!uri) return;

const dirPath = uri.fsPath;
const hasBuild = fs.existsSync(path.join(dirPath, 'BUILD')) ||
fs.existsSync(path.join(dirPath, 'BUILD.bazel'));
if (!hasBuild) {
vscode.window.showWarningMessage('No BUILD file found in selected directory.');
return;
}

const relativeDir = path.relative(workspaceRoot, dirPath);
const bazelprojectPath = path.join(workspaceRoot, '.bazelproject');
const result = addDirectoryToBazelproject(bazelprojectPath, relativeDir);

if (result === 'already-exists') {
vscode.window.showInformationMessage(`'${relativeDir}' is already in the Bazel project scope.`);
} else if (result === 'added') {
vscode.window.showInformationMessage(`Added '${relativeDir}' to Bazel project scope.`);
} else {
vscode.window.showInformationMessage(`Created .bazelproject with '${relativeDir}'.`);
}
})
);
}

export function registerRuntimeCommands(context: vscode.ExtensionContext) {
context.subscriptions.push(
vscode.commands.registerCommand('bazel-jdt.syncProject', async () => {
Expand Down
4 changes: 3 additions & 1 deletion bazel-jdt-bridge/vscode-extension/src/extension.ts
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import * as vscode from 'vscode';
import * as path from 'path';
import * as fs from 'fs';
import { registerImportCommand, registerRuntimeCommands } from './commands';
import { registerImportCommand, registerRuntimeCommands, registerAddDirectoryCommand } from './commands';
import { BazelDebugConfigurationProvider } from './debugAdapter';
import { createStatusBar } from './statusBar';
import { getConfig } from './config';
Expand All @@ -26,6 +26,7 @@ export async function activate(context: vscode.ExtensionContext) {
activateFull(context, workspaceRoot);
} else {
registerImportCommand(context);
registerAddDirectoryCommand(context, workspaceRoot);
setupCreationOnlyWatcher(context, workspaceRoot);
}
}
Expand All @@ -34,6 +35,7 @@ function activateFull(context: vscode.ExtensionContext, workspaceRoot: string) {
const statusBarItem = createStatusBar(context);
registerImportCommand(context);
registerRuntimeCommands(context);
registerAddDirectoryCommand(context, workspaceRoot);
context.subscriptions.push(
vscode.debug.registerDebugConfigurationProvider(
'java', new BazelDebugConfigurationProvider()
Expand Down
Loading