fiix expandpath

pull/5370/head
filip mertens 1 year ago
parent a7a3766939
commit b108363e2a
  1. 6
      apps/remix-ide/src/app/files/dgitProvider.ts
  2. 2
      apps/remix-ide/src/app/plugins/electron/compilerLoaderPlugin.ts
  3. 28
      apps/remix-ide/src/app/plugins/electron/scriptRunnerPlugin.ts
  4. 8
      libs/remix-ui/workspace/src/lib/reducers/workspace.ts

@ -459,7 +459,7 @@ class DGitProvider extends Plugin {
if (gitmodules) { if (gitmodules) {
const lines = gitmodules.split('\n') const lines = gitmodules.split('\n')
let currentModule:any = {} let currentModule:any = {}
let modules = [] const modules = []
for (let line of lines) { for (let line of lines) {
line = line.trim() line = line.trim()
if (line.startsWith('[')) { if (line.startsWith('[')) {
@ -491,7 +491,7 @@ class DGitProvider extends Plugin {
this.call('terminal', 'logHtml', `Found ${(gitmodules && gitmodules.length) || 0} submodules in ${currentDir || '/'}`) this.call('terminal', 'logHtml', `Found ${(gitmodules && gitmodules.length) || 0} submodules in ${currentDir || '/'}`)
//parse gitmodules //parse gitmodules
if (gitmodules) { if (gitmodules) {
for (let module of gitmodules) { for (const module of gitmodules) {
const dir = path.join(currentDir, module.path) const dir = path.join(currentDir, module.path)
const targetPath = (await this.getGitConfig(dir)).dir const targetPath = (await this.getGitConfig(dir)).dir
if (await window.remixFileSystem.exists(targetPath)) { if (await window.remixFileSystem.exists(targetPath)) {
@ -505,7 +505,7 @@ class DGitProvider extends Plugin {
} }
} }
} }
for (let module of gitmodules) { for (const module of gitmodules) {
const dir = path.join(currentDir, module.path) const dir = path.join(currentDir, module.path)
// if url contains git@github.com: convert it // if url contains git@github.com: convert it
if(module.url && module.url.startsWith('git@github.com:')) { if(module.url && module.url.startsWith('git@github.com:')) {

@ -19,7 +19,7 @@ export class compilerLoaderPlugin extends Plugin {
} }
async getJsonBinData() { async getJsonBinData() {
let response: iSolJsonBinData = { const response: iSolJsonBinData = {
baseURLBin: '', baseURLBin: '',
baseURLWasm: '', baseURLWasm: '',
binList: [], binList: [],

@ -12,20 +12,20 @@ export class scriptRunnerPlugin extends ElectronPlugin {
} }
async onActivation(): Promise<void> { async onActivation(): Promise<void> {
this.on('scriptRunner', 'missingModule', async (module: string) => { this.on('scriptRunner', 'missingModule', async (module: string) => {
console.log('missingModule', module) console.log('missingModule', module)
const addModuleModal: AppModal = { const addModuleModal: AppModal = {
id: 'AddModuleModal', id: 'AddModuleModal',
title: `Missing module ${module}`, title: `Missing module ${module}`,
message: `Do you want to install the missing module? ${module} \n\nYou can also install it manually using the terminal if you have yarn or npm installed:\nyarn add ${module}`, message: `Do you want to install the missing module? ${module} \n\nYou can also install it manually using the terminal if you have yarn or npm installed:\nyarn add ${module}`,
okLabel: 'Install', okLabel: 'Install',
cancelLabel: 'No', cancelLabel: 'No',
} }
const result = await this.call('notification', 'modal', addModuleModal) const result = await this.call('notification', 'modal', addModuleModal)
if (result) { if (result) {
await this.addModule(module) await this.addModule(module)
} }
}) })
} }
async addModule(module: string, version: string = ''): Promise<void> { async addModule(module: string, version: string = ''): Promise<void> {

@ -327,6 +327,10 @@ export const browserReducer = (state = browserInitialState, action: Actions) =>
state.mode === 'browser' state.mode === 'browser'
? fileAdded(state, payload) ? fileAdded(state, payload)
: state.browser.files, : state.browser.files,
expandPath:
state.mode === 'browser'
? [...new Set([...state.browser.expandPath, payload])]
: state.browser.expandPath
}, },
localhost: { localhost: {
...state.localhost, ...state.localhost,
@ -353,6 +357,10 @@ export const browserReducer = (state = browserInitialState, action: Actions) =>
state.mode === 'browser' state.mode === 'browser'
? fetchDirectoryContent(state, payload) ? fetchDirectoryContent(state, payload)
: state.browser.files, : state.browser.files,
expandPath:
state.mode === 'browser'
? [...new Set([...state.browser.expandPath, payload.folderPath])]
: state.browser.expandPath
}, },
localhost: { localhost: {
...state.localhost, ...state.localhost,

Loading…
Cancel
Save