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
60 changes: 59 additions & 1 deletion src/completions.ts
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,9 @@ import * as vscode from 'vscode';

import * as session from './session';

import { extendSelection } from './selection';
import { cleanLine } from './lineCache';


// Get with names(roxygen2:::default_tags())
const roxygenTagCompletionItems = [
Expand Down Expand Up @@ -93,11 +96,16 @@ export class LiveCompletionItemProvider implements vscode.CompletionItemProvider
});
}

if (trigger === undefined || trigger === '"' || trigger === '\'') {
if (trigger === undefined || trigger === '[' || trigger === ',' || trigger === '"' || trigger === '\'') {
const bracketItems = getBracketCompletionItems(document, position, token);
items.push(...bracketItems);
}

if (trigger === undefined || trigger === '(' || trigger === ',') {
const pipelineItems = getPipelineCompletionItems(document, position, token);
items.push(...pipelineItems);
}

return items;
}
}
Expand Down Expand Up @@ -149,3 +157,53 @@ function getBracketCompletionItems(document: vscode.TextDocument, position: vsco
}
return items;
}

function getPipelineCompletionItems(document: vscode.TextDocument, position: vscode.Position, token: vscode.CancellationToken) {
const items: vscode.CompletionItem[] = [];
const range = extendSelection(position.line, (x) => document.lineAt(x).text, document.lineCount);
let symbol: string;

for (let i = range.startLine; i <= range.endLine; i++) {
if (token.isCancellationRequested) {
break;
}

const line = document.lineAt(i);
if (line.isEmptyOrWhitespace) {
continue;
}

const cleanedLine = cleanLine(line.text);
if (cleanedLine.length === 0) {
continue;
}

const pipeSymbolIndex = line.text.search(/([\w_.]+)\s*(%.+%|\|>)/);
if (pipeSymbolIndex < 0) {
break;
}

const symbolPosition = new vscode.Position(i, pipeSymbolIndex);
const symbolRange = document.getWordRangeAtPosition(symbolPosition);

if (symbolRange !== undefined) {
symbol = document.getText(symbolRange);
}

break;
}

if (!token.isCancellationRequested && symbol !== undefined) {
const obj = session.globalenv[symbol];
if (obj !== undefined && obj.names !== undefined) {
const doc = new vscode.MarkdownString('Element of `' + symbol + '`');
obj.names.map((name: string) => {
const item = new vscode.CompletionItem(name, vscode.CompletionItemKind.Field);
item.detail = '[session]';
item.documentation = doc;
items.push(item);
});
}
}
return items;
}
2 changes: 1 addition & 1 deletion src/extension.ts
Original file line number Diff line number Diff line change
Expand Up @@ -164,7 +164,7 @@ export async function activate(context: vscode.ExtensionContext): Promise<apiImp
void vscode.commands.executeCommand('setContext', 'r.WorkspaceViewer:show', enableSessionWatcher);

// if session watcher is active, register dyamic completion provider
const liveTriggerCharacters = ['', '$', '@', '"', '\'' ];
const liveTriggerCharacters = ['', '[', '(', ',', '$', '@', '"', '\'' ];
vscode.languages.registerCompletionItemProvider('r', new completions.LiveCompletionItemProvider(), ...liveTriggerCharacters);
}

Expand Down
2 changes: 1 addition & 1 deletion src/lineCache.ts
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ function isComment(c: string) {
return c === '#';
}

function cleanLine(text: string) {
export function cleanLine(text: string): string {
let cleaned = '';
let withinQuotes = null;
for (let i = 0; i < text.length; i++) {
Expand Down
4 changes: 2 additions & 2 deletions src/selection.ts
Original file line number Diff line number Diff line change
Expand Up @@ -190,8 +190,8 @@ export function extendSelection(line: number, getLine: (line: number) => string,
endLine: number;
} {
const lc = new LineCache(getLine, lineCount);
const getLineFromCache = (x) => lc.getLineFromCache(x);
const getEndsInOperatorFromCache = (x) => lc.getEndsInOperatorFromCache(x);
const getLineFromCache = (x: number) => lc.getLineFromCache(x);
const getEndsInOperatorFromCache = (x: number) => lc.getEndsInOperatorFromCache(x);
let lookingForward = true;
/* poss[1] is the farthest point reached looking forward from line,
and poss[0] is the farthest point reached looking backward from line. */
Expand Down