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
2 changes: 1 addition & 1 deletion src/extension.ts
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ import * as workspaceViewer from './workspaceViewer';
import * as apiImplementation from './apiImplementation';
import * as rHelp from './helpViewer';
import * as completions from './completions';
import * as rShare from './liveshare';
import * as rShare from './liveShare';
import * as httpgdViewer from './plotViewer';
import * as languageService from './languageService';

Expand Down
2 changes: 1 addition & 1 deletion src/helpViewer/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ import { HelpPanel } from './panel';
import { HelpProvider, AliasProvider } from './helpProvider';
import { HelpTreeWrapper } from './treeView';
import { PackageManager } from './packages';
import { isGuestSession, rGuestService } from '../liveshare';
import { isGuestSession, rGuestService } from '../liveShare';

// Initialization function that is called once when activating the extension
export async function initializeHelp(context: vscode.ExtensionContext, rExtension: api.RExtension): Promise<RHelp|undefined> {
Expand Down
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
2 changes: 1 addition & 1 deletion src/plotViewer/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ import { extensionContext } from '../extension';

import { FocusPlotMessage, InMessage, OutMessage, ToggleStyleMessage, UpdatePlotMessage, HidePlotMessage, AddPlotMessage, PreviewPlotLayout, PreviewPlotLayoutMessage, ToggleFullWindowMessage } from './webviewMessages';

import { isHost, rHostService, shareBrowser } from '../liveshare';
import { isHost, rHostService, shareBrowser } from '../liveShare';

const commands = [
'showViewers',
Expand Down
2 changes: 1 addition & 1 deletion src/rTerminal.ts
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ import * as selection from './selection';
import { getSelection } from './selection';
import { removeSessionFiles } from './session';
import { config, delay, getRterm } from './util';
import { rGuestService, isGuestSession } from './liveshare';
import { rGuestService, isGuestSession } from './liveShare';
export let rTerm: vscode.Terminal;

export async function runSource(echo: boolean): Promise<void> {
Expand Down
2 changes: 1 addition & 1 deletion src/session.ts
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ import { config, readContent } from './util';
import { purgeAddinPickerItems, dispatchRStudioAPICall } from './rstudioapi';

import { homeExtDir, rWorkspace, globalRHelp, globalHttpgdManager } from './extension';
import { UUID, rHostService, rGuestService, isLiveShare, isHost, isGuestSession, closeBrowser, guestResDir, shareBrowser, openVirtualDoc, shareWorkspace } from './liveshare';
import { UUID, rHostService, rGuestService, isLiveShare, isHost, isGuestSession, closeBrowser, guestResDir, shareBrowser, openVirtualDoc, shareWorkspace } from './liveShare';

export let globalenv: any;
let resDir: string;
Expand Down
2 changes: 1 addition & 1 deletion src/util.ts
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import winreg = require('winreg');
import * as path from 'path';
import * as vscode from 'vscode';
import * as cp from 'child_process';
import { rGuestService, isGuestSession } from './liveshare';
import { rGuestService, isGuestSession } from './liveShare';

export function config(): vscode.WorkspaceConfiguration {
return vscode.workspace.getConfiguration('r');
Expand Down
4 changes: 2 additions & 2 deletions src/workspaceViewer.ts
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import { TreeDataProvider, EventEmitter, TreeItemCollapsibleState, TreeItem, Eve
import { runTextInTerm } from './rTerminal';
import { globalenv, workingDir } from './session';
import { config } from './util';
import { isGuestSession, isLiveShare, UUID, guestGlobalenv } from './liveshare';
import { isGuestSession, isLiveShare, UUID, guestGlobalenv } from './liveShare';

interface WorkspaceAttr {
[key: string]: {
Expand Down Expand Up @@ -254,4 +254,4 @@ export function viewItem(node: string): void {

export function removeItem(node: string): void {
void runTextInTerm(`rm(${node})`);
}
}