Merge branch 'master' into metamask2

pull/5358/head
bunsenstraat 3 weeks ago committed by GitHub
commit 02be07f850
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
  1. 2
      apps/remix-ide/src/app/plugins/parser/services/code-parser-compiler.ts
  2. 3
      libs/remix-ui/editor/src/lib/remix-ui-editor.tsx

@ -161,7 +161,7 @@ export default class CodeParserCompiler {
"*": ["evm.gasEstimates"] "*": ["evm.gasEstimates"]
} }
}, },
"evmVersion": state.evmVersion && state.evmVersion.toString() || "cancun", "evmVersion": state.evmVersion && state.evmVersion.toString() || undefined,
} }
} }

@ -992,6 +992,9 @@ export const EditorUI = (props: EditorUIProps) => {
// Allow JSON schema requests // Allow JSON schema requests
monacoRef.current.languages.json.jsonDefaults.setDiagnosticsOptions({ enableSchemaRequest: true }) monacoRef.current.languages.json.jsonDefaults.setDiagnosticsOptions({ enableSchemaRequest: true })
// hide the module resolution error. We have to remove this when we know how to properly resolve imports.
monacoRef.current.languages.typescript.typescriptDefaults.setDiagnosticsOptions({ diagnosticCodesToIgnore: [2792]})
// Register a tokens provider for the language // Register a tokens provider for the language
monacoRef.current.languages.setMonarchTokensProvider('remix-solidity', solidityTokensProvider as any) monacoRef.current.languages.setMonarchTokensProvider('remix-solidity', solidityTokensProvider as any)
monacoRef.current.languages.setLanguageConfiguration('remix-solidity', solidityLanguageConfig as any) monacoRef.current.languages.setLanguageConfiguration('remix-solidity', solidityLanguageConfig as any)

Loading…
Cancel
Save