Merge branch 'master' into matomodesktop

Author: bunsenstraat

apps/remix-ide-e2e/src/tests/code_format.test.ts

@@ -80,21 +80,17 @@ proposalNames.push(bytes32("candidate1"));
 }`
 
 const formattedContract = `pragma solidity >=0.4.22 <0.9.0;
-
 contract unfomattedContract {
     bytes32[] proposalNames;
-
     function beforeAll() public {
         proposalNames.push(bytes32("candidate1"));
         ballotToTest = new Ballot(proposalNames);
     }
 }`
 
 const formattedWithTabWidth2 = `pragma solidity >=0.4.22 <0.9.0;
-
 contract unfomattedContract {
   bytes32[] proposalNames;
-
   function beforeAll() public {
     proposalNames.push(bytes32("candidate1"));
     ballotToTest = new Ballot(proposalNames);

apps/remix-ide/src/app/panels/tab-proxy.js

@@ -186,7 +186,8 @@ export default class TabProxy extends Plugin {
             this.call('manager', 'deactivatePlugin', name)
           },
           icon,
-          description
+          description,
+          show
         )
         show && this.switchTab(name)
       }
@@ -210,6 +211,10 @@ export default class TabProxy extends Plugin {
 
   focus (name) {
     this.emit('switchApp', name)
+    const tabIndex = this.loadedTabs.findIndex(tab => tab.name === name)
+    if (tabIndex !== -1) {
+      this.loadedTabs[tabIndex].show = true
+    }
     this.tabsApi.activateTab(name)
   }
 
@@ -259,7 +264,7 @@ export default class TabProxy extends Plugin {
    * @param {string} description
    * @returns
    */
-  addTab (name, title, switchTo, close, icon, description = '') {
+  addTab (name, title, switchTo, close, icon, description = '', show = true) {
     if (this._handlers[name]) return this.renderComponent()
 
     if ((name.endsWith('.vy') && icon === undefined) || title.includes('Vyper')) {
@@ -290,7 +295,8 @@ export default class TabProxy extends Plugin {
             title,
             icon,
             tooltip: name,
-            iconClass: getPathIcon(name)
+            iconClass: getPathIcon(name),
+            show
           })
           formatPath.shift()
           if (formatPath.length > 0) {
@@ -307,7 +313,8 @@ export default class TabProxy extends Plugin {
                 title: duplicateTabTitle,
                 icon,
                 tooltip: duplicateTabTooltip || duplicateTabTitle,
-                iconClass: getPathIcon(duplicateTabName)
+                iconClass: getPathIcon(duplicateTabName),
+                show
               }
             }
           }
@@ -321,7 +328,8 @@ export default class TabProxy extends Plugin {
         title,
         icon,
         tooltip: description || title,
-        iconClass: getPathIcon(name)
+        iconClass: getPathIcon(name),
+        show
       })
     }
 
@@ -335,17 +343,29 @@ export default class TabProxy extends Plugin {
     if(!this.loadedTabs.find(tab => tab.name === name)) return // prevent removing tab that doesn't exist
     this.loadedTabs = this.loadedTabs.filter((tab, index) => {
       if (!previous && tab.name === name) {
-        if(index - 1  >= 0 && this.loadedTabs[index - 1])
-          previous = this.loadedTabs[index - 1]
-        else if (index + 1 && this.loadedTabs[index + 1])
-          previous = this.loadedTabs[index + 1]
+        previous = this.getPreviousVisibleTab(index)
+        if (!previous) previous = this.getNextVisibleTab(index)
       }
       return tab.name !== name
     })
     this.renderComponent()
     if (previous) this.switchTab(previous.name)
   }
 
+  getPreviousVisibleTab (index) {
+    for (let i = index - 1; i >= 0; i--) {
+      if (this.loadedTabs[i].show) return this.loadedTabs[i]
+    }
+    return null
+  }
+
+  getNextVisibleTab (index) {
+    for (let i = index + 1; i < this.loadedTabs.length; i++) {
+      if (this.loadedTabs[i].show) return this.loadedTabs[i]
+    }
+    return null
+  }
+
   addHandler (type, fn) {
     this.handlers[type] = fn
   }

apps/remix-ide/src/app/plugins/code-format.ts

@@ -1,7 +1,6 @@
 'use strict'
 import { Plugin } from '@remixproject/engine'
-import { Options } from 'prettier';
-import sol from './code-format/index'
+import { Options } from 'prettier'
 import path from 'path'
 import yaml from 'js-yaml'
 import toml from 'toml'
@@ -82,6 +81,7 @@ export class CodeFormat extends Plugin {
       this.babel = await import('prettier/parser-babel')
       this.espree = await import('prettier/parser-espree')
       this.yml = await import('prettier/parser-yaml')
+      this.sol = (await import('prettier-plugin-solidity')).default
     }
 
     try {
@@ -92,7 +92,7 @@ export class CodeFormat extends Plugin {
       }
       switch (path.extname(file)) {
       case '.sol':
-        parserName = 'solidity-parse'
+        parserName = 'slang'
         break
       case '.ts':
         parserName = 'typescript'
@@ -231,7 +231,7 @@ export class CodeFormat extends Plugin {
             }
           }
         })
-        const validParsers = ['typescript', 'babel', 'espree', 'solidity-parse', 'json', 'yaml', 'solidity-parse']
+        const validParsers = ['typescript', 'babel', 'espree', 'json', 'yaml', 'slang']
         if (override && override.options && override.options.parser) {
           if (validParsers.includes(override.options.parser)) {
             parserName = override.options.parser
@@ -249,8 +249,8 @@ export class CodeFormat extends Plugin {
         }
       }
 
-      const result = this.prettier.format(content, {
-        plugins: [sol as any, this.ts, this.babel, this.espree, this.yml],
+      const result = await this.prettier.format(content, {
+        plugins: [this.sol, this.ts, this.babel, this.espree, this.yml],
         parser: parserName,
         ...options
       })
@@ -260,6 +260,7 @@ export class CodeFormat extends Plugin {
       return result
     } catch (e) {
       // do nothing
+      console.error(e)
     }
   }
 

apps/remix-ide/src/app/plugins/code-format/index.ts

@@ -66,7 +66,7 @@ export default class SettingsTab extends ViewPlugin {
 
   render() {
     return (
-      <div id="settingsTab" className="bg-light">
+      <div id="settingsTab" className="bg-light overflow-hidden">
         <PluginViewWrapper plugin={this} />
       </div>
     )

apps/remix-ide/src/app/tabs/settings-tab.tsx

@@ -137,6 +137,10 @@ module.exports = composePlugins(withNx(), withReact(), (config) => {
     })
   )
 
+  config.plugins.push(
+    new webpack.IgnorePlugin({ resourceRegExp: /^node:/ })
+  )
+
   // source-map loader
   config.module.rules.push({
     test: /\.js$/,

apps/remix-ide/webpack.config.js

@@ -34,6 +34,7 @@ export interface Tab {
   name: string
   title: string
   tooltip: string
+  show: boolean
 }
 export interface TabsUIApi {
   activateTab: (name: string) => void
@@ -95,7 +96,7 @@ export const TabsUI = (props: TabsUIProps) => {
   const [compileState, setCompileState] = useState<'idle' | 'compiling' | 'compiled'>('idle')
 
   useEffect(() => {
-    if (props.tabs[tabsState.selectedIndex]) {
+    if (props.tabs[tabsState.selectedIndex] && props.tabs[tabsState.selectedIndex].show) {
       tabsRef.current[tabsState.selectedIndex].scrollIntoView({
         behavior: 'smooth',
         block: 'center'
@@ -614,14 +615,14 @@ export const TabsUI = (props: TabsUIProps) => {
         >
           <TabList className="d-flex flex-row align-items-center">
             {props.tabs.map((tab, i) => (
-              <Tab className="" key={tab.name} data-id={tab.id}>
+              <Tab className={tab.show ? '' : 'd-none'} key={tab.name} data-id={tab.id}>
                 {renderTab(tab, i)}
               </Tab>
             ))}
             <div style={{ minWidth: '4rem', height: '1rem' }} id="dummyElForLastXVisibility"></div>
           </TabList>
           {props.tabs.map((tab) => (
-            <TabPanel key={tab.name}></TabPanel>
+            <TabPanel className={tab.show ? '' : 'd-none'} key={tab.name}></TabPanel>
           ))}
         </Tabs>
 

libs/remix-ui/tabs/src/lib/remix-ui-tabs.tsx

@@ -182,8 +182,8 @@
     "octokit": "^3.1.2",
     "path-browserify": "^1.0.1",
     "permissionless": "0.2.25",
-    "prettier": "^2.8.4",
-    "prettier-plugin-solidity": "^1.0.0-beta.24",
+    "prettier": "^3.6.2",
+    "prettier-plugin-solidity": "^2.1.0",
     "ra-data-graphql": "^4.16.11",
     "raw-loader": "^4.0.2",
     "react": "^18.2.0",
@@ -216,6 +216,7 @@
     "signale": "^1.4.0",
     "snarkjs": "^0.7.0",
     "sol2uml": "^2.4.3",
+    "solidity-comments-extractor": "^0.0.8",
     "string-similarity": "^4.0.4",
     "svg2pdf.js": "^2.2.1",
     "text-encoding": "^0.7.0",