From 7977ef9b3ccf964a25c24f0ead814270e3c9ab4a Mon Sep 17 00:00:00 2001 From: Kun Ren Date: Sat, 31 Jul 2021 23:15:37 +0800 Subject: [PATCH 1/2] Rename liveshare folder to liveShare --- src/extension.ts | 2 +- src/helpViewer/index.ts | 2 +- src/plotViewer/index.ts | 2 +- src/rTerminal.ts | 2 +- src/session.ts | 2 +- src/util.ts | 2 +- src/workspaceViewer.ts | 4 ++-- 7 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/extension.ts b/src/extension.ts index 4b665b960..29d70673f 100644 --- a/src/extension.ts +++ b/src/extension.ts @@ -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'; diff --git a/src/helpViewer/index.ts b/src/helpViewer/index.ts index ae0facd32..59a64fade 100644 --- a/src/helpViewer/index.ts +++ b/src/helpViewer/index.ts @@ -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 { diff --git a/src/plotViewer/index.ts b/src/plotViewer/index.ts index 44d0bf802..0b5c91f85 100644 --- a/src/plotViewer/index.ts +++ b/src/plotViewer/index.ts @@ -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', diff --git a/src/rTerminal.ts b/src/rTerminal.ts index aabd5257d..43e8fe0c0 100644 --- a/src/rTerminal.ts +++ b/src/rTerminal.ts @@ -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 { diff --git a/src/session.ts b/src/session.ts index 4cf8547df..85dcab5f1 100644 --- a/src/session.ts +++ b/src/session.ts @@ -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; diff --git a/src/util.ts b/src/util.ts index cfe6d0f8d..b961cf268 100644 --- a/src/util.ts +++ b/src/util.ts @@ -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'); diff --git a/src/workspaceViewer.ts b/src/workspaceViewer.ts index 7117a7836..799217124 100644 --- a/src/workspaceViewer.ts +++ b/src/workspaceViewer.ts @@ -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]: { @@ -254,4 +254,4 @@ export function viewItem(node: string): void { export function removeItem(node: string): void { void runTextInTerm(`rm(${node})`); -} \ No newline at end of file +} From 8517b2d39f739fc49062fc893af75b5a127f40e3 Mon Sep 17 00:00:00 2001 From: Kun Ren Date: Sat, 31 Jul 2021 23:23:43 +0800 Subject: [PATCH 2/2] Rename folder --- src/{liveshare => liveShare}/index.ts | 0 src/{liveshare => liveShare}/shareCommands.ts | 0 src/{liveshare => liveShare}/shareSession.ts | 0 src/{liveshare => liveShare}/shareTree.ts | 0 src/{liveshare => liveShare}/virtualDocs.ts | 0 5 files changed, 0 insertions(+), 0 deletions(-) rename src/{liveshare => liveShare}/index.ts (100%) rename src/{liveshare => liveShare}/shareCommands.ts (100%) rename src/{liveshare => liveShare}/shareSession.ts (100%) rename src/{liveshare => liveShare}/shareTree.ts (100%) rename src/{liveshare => liveShare}/virtualDocs.ts (100%) diff --git a/src/liveshare/index.ts b/src/liveShare/index.ts similarity index 100% rename from src/liveshare/index.ts rename to src/liveShare/index.ts diff --git a/src/liveshare/shareCommands.ts b/src/liveShare/shareCommands.ts similarity index 100% rename from src/liveshare/shareCommands.ts rename to src/liveShare/shareCommands.ts diff --git a/src/liveshare/shareSession.ts b/src/liveShare/shareSession.ts similarity index 100% rename from src/liveshare/shareSession.ts rename to src/liveShare/shareSession.ts diff --git a/src/liveshare/shareTree.ts b/src/liveShare/shareTree.ts similarity index 100% rename from src/liveshare/shareTree.ts rename to src/liveShare/shareTree.ts diff --git a/src/liveshare/virtualDocs.ts b/src/liveShare/virtualDocs.ts similarity index 100% rename from src/liveshare/virtualDocs.ts rename to src/liveShare/virtualDocs.ts