Merge branch 'master' into fix-resolver

apps/remix-ide/src/app/panels/terminal.js

@@ -121,7 +121,6 @@ class Terminal extends Plugin {
 
   renderComponent () {
     const onReady = (api) => { this.terminalApi = api }
-    console.log(this)
     this.dispatch({
       plugin: this,
       onReady: onReady

libs/remix-core-plugin/src/lib/compiler-content-imports.ts

@@ -123,7 +123,6 @@ export class CompilerImports extends Plugin {
     * @returns {Promise} - string content
     */
   async resolveAndSave (url, targetPath) {
-    console.log('resolveAndSave', url, targetPath)
     try {
       if (targetPath && this.currentRequest) {
         const canCall = await this.askUserPermission('resolveAndSave', 'This action will update the path ' + targetPath)

libs/remix-solidity/src/compiler/compiler.ts

@@ -72,7 +72,6 @@ export class Compiler {
     if (typeof (window) !== 'undefined' && Worker) {
       const ESWebWorker = await import('../lib/es-web-worker/es-web-worker-handler')
       this.workerHandler = new ESWebWorker.default()
-      console.log('worker handler loaded', this.workerHandler)
     }
   }
 
@@ -286,7 +285,6 @@ export class Compiler {
    */
 
   loadWorker(url: string): void {
-    console.log(this)
 
     this.state.worker = this.workerHandler.getWorker()
     const jobs: Record<'sources', SourceWithTarget>[] = []
@@ -388,7 +386,6 @@ export class Compiler {
       if (m && m in files) continue
 
       if (this.handleImportCall) {
-        console.log('calling handleImportCall', this.handleImportCall)
         this.handleImportCall(m, (err, content: string) => {
           if (err && cb) cb(err)
           else {

libs/remix-solidity/src/lib/es-web-worker/compiler-worker.ts

@@ -8,7 +8,6 @@ self.onmessage = (e: MessageEvent) => {
   switch (data.cmd) {
     case 'loadVersion':
       {
-        console.log(self);
         (self as any).importScripts(data.data)
         const compiler = setupMethods(self)
         compileJSON = (input) => {

libs/remix-ui/editor/src/lib/providers/definitionProvider.ts

@@ -29,15 +29,18 @@ export class RemixDefinitionProvider implements monaco.languages.DefinitionProvi
                 }
             }
         }
-        return [{
-            uri: this.monaco.Uri.parse(jumpLocation.fileName),
-            range: {
-                startLineNumber: jumpLocation.startLineNumber,
-                startColumn: jumpLocation.startColumn,
-                endLineNumber: jumpLocation.endLineNumber,
-                endColumn: jumpLocation.endColumn
-            }
-        }]
+        if (jumpLocation && jumpLocation.fileName) {
+            return [{
+                uri: this.monaco.Uri.parse(jumpLocation.fileName),
+                range: {
+                    startLineNumber: jumpLocation.startLineNumber,
+                    startColumn: jumpLocation.startColumn,
+                    endLineNumber: jumpLocation.endLineNumber,
+                    endColumn: jumpLocation.endColumn
+                }
+            }]
+        }
+        return []
     }
 
     async jumpToDefinition(position: any) {

libs/remix-ui/editor/src/lib/providers/referenceProvider.ts

@@ -28,7 +28,7 @@ export class RemixReferenceProvider implements monaco.languages.ReferenceProvide
               fileTarget = fileTarget.file
               const fileContent = await this.props.plugin.call('fileManager', 'readFile', fileInNode)
               const lineColumn = await this.props.plugin.call('codeParser', 'getLineColumnOfPosition', position)
-              console.log(position, fileTarget, lineColumn)
+
               try {
                 this.props.plugin.call('editor', 'addModel', fileTarget, fileContent)
               } catch (e) {

libs/remix-ui/editor/src/lib/web-types.ts

@@ -6,7 +6,6 @@ export const loadTypes = async (monaco) => {
 
     // @ts-ignore
     const ethersAbi = await import('raw-loader!@ethersproject/abi/lib/index.d.ts')
-    console.log(ethersAbi)
     const ethersAbiDefault = ethersAbi.default.replace(/@ethersproject\//g, '@ethersproject_')
     monaco.languages.typescript.typescriptDefaults.addExtraLib(ethersAbiDefault, `file:///node_modules/@types/@ethersproject_abi/index.d.ts`)