diff --git a/apps/remix-ide/src/app.js b/apps/remix-ide/src/app.js index 1694df5c45..65dada72c8 100644 --- a/apps/remix-ide/src/app.js +++ b/apps/remix-ide/src/app.js @@ -15,7 +15,6 @@ import { PermissionHandlerPlugin } from './app/plugins/permission-handler-plugin import { AstWalker } from '@remix-project/remix-astwalker' import { LinkLibraries, DeployLibraries, OpenZeppelinProxy } from '@remix-project/core-plugin' import { CodeParser } from './app/plugins/parser/code-parser' -import { FileDecorator } from './app/plugins/file-decorator' import { WalkthroughService } from './walkthroughService' @@ -216,7 +215,7 @@ class AppComponent { ) const codeParser = new CodeParser(new AstWalker()) - const fileDecorator = new FileDecorator() + this.notification = new NotificationPlugin() diff --git a/libs/remix-ui/editor/src/lib/remix-ui-editor.tsx b/libs/remix-ui/editor/src/lib/remix-ui-editor.tsx index 73496fe2ad..745f1ecc5c 100644 --- a/libs/remix-ui/editor/src/lib/remix-ui-editor.tsx +++ b/libs/remix-ui/editor/src/lib/remix-ui-editor.tsx @@ -5,7 +5,6 @@ import { reducerActions, reducerListener, initialState } from './actions/editor' import { solidityTokensProvider, solidityLanguageConfig } from './syntaxes/solidity' import { cairoTokensProvider, cairoLanguageConfig } from './syntaxes/cairo' import { zokratesTokensProvider, zokratesLanguageConfig } from './syntaxes/zokrates' -import { IMarkdownString } from 'monaco-editor' import './remix-ui-editor.css' import { loadTypes } from './web-types' @@ -328,18 +327,6 @@ export const EditorUI = (props: EditorUIProps) => { } } if (typeOfDecoration === 'lineTextPerFile') { -<<<<<<< HEAD - decoration = decoration as lineText - return { - type: typeOfDecoration, - range: new monacoRef.current.Range(decoration.position.start.line + 1, decoration.position.start.column + 1, decoration.position.start.line + 1, 1024), - options: { - after: { content: ` ${decoration.content}`, inlineClassName: `${decoration.className}` }, - afterContentClassName: `${decoration.afterContentClassName}`, - hoverMessage : decoration.hoverMessage - }, - -======= const lineTextDecoration = decoration as lineText return { type: typeOfDecoration, @@ -349,8 +336,6 @@ export const EditorUI = (props: EditorUIProps) => { afterContentClassName: `${lineTextDecoration.afterContentClassName}`, hoverMessage : lineTextDecoration.hoverMessage }, - ->>>>>>> 74becf0e1b2f9500395be90167d3b6c237d13735 } } } @@ -538,7 +523,7 @@ export const EditorUI = (props: EditorUIProps) => { }) // zoomin zoomout - editor.addCommand(monacoRef.current.KeyMod.CtrlCmd | monacoRef.current.KeyCode.US_EQUAL, () => { + editor.addCommand(monacoRef.current.KeyMod.CtrlCmd | (monacoRef.current.KeyCode as any).US_EQUAL, () => { editor.updateOptions({ fontSize: editor.getOption(43).fontSize + 1 }) }) editor.addCommand(monacoRef.current.KeyMod.CtrlCmd | (monacoRef.current.KeyCode as any).US_MINUS, () => { @@ -601,6 +586,9 @@ export const EditorUI = (props: EditorUIProps) => { monacoRef.current.languages.setMonarchTokensProvider('remix-cairo', cairoTokensProvider as any) monacoRef.current.languages.setLanguageConfiguration('remix-cairo', cairoLanguageConfig as any) + monacoRef.current.languages.setMonarchTokensProvider('remix-zokrates', zokratesTokensProvider as any) + monacoRef.current.languages.setLanguageConfiguration('remix-zokrates', zokratesLanguageConfig as any) + monacoRef.current.languages.registerDefinitionProvider('remix-solidity', new RemixDefinitionProvider(props, monaco)) monacoRef.current.languages.registerDocumentHighlightProvider('remix-solidity', new RemixHighLightProvider(props, monaco)) monacoRef.current.languages.registerReferenceProvider('remix-solidity', new RemixReferenceProvider(props, monaco)) diff --git a/yarn.lock b/yarn.lock index 6839e41198..126971157e 100644 --- a/yarn.lock +++ b/yarn.lock @@ -4486,14 +4486,6 @@ resolved "https://registry.yarnpkg.com/@types/mocha/-/mocha-7.0.2.tgz#b17f16cf933597e10d6d78eae3251e692ce8b0ce" integrity sha512-ZvO2tAcjmMi8V/5Z3JsyofMe3hasRcaw88cto5etSVMwVQfeivGAlEYmaQgceUSVYFofVjT+ioHsATjdWcFt1w== -<<<<<<< HEAD -"@types/nightwatch@^2.0.9": - version "2.0.9" - resolved "https://registry.yarnpkg.com/@types/nightwatch/-/nightwatch-2.0.9.tgz#c5d3ed42ead7a58563cac96ebc52f40f09897ea1" - integrity sha512-vA568B2hjedgtjNf/ZM1po9Y5GWz8+jox0748+YyqilWIxV5fXkpKFSUWk41Evoqn5WI3JENlNupzs2o6pHjRA== - dependencies: - "@types/selenium-webdriver" "*" -======= "@types/nightwatch@^2.3.1": version "2.3.1" resolved "https://registry.yarnpkg.com/@types/nightwatch/-/nightwatch-2.3.1.tgz#36cb1f2408f910c06e3de5b0365f6f6a606b1c69" @@ -4502,7 +4494,6 @@ "@types/chai" "*" "@types/selenium-webdriver" "*" devtools-protocol "^0.0.1025565" ->>>>>>> 74becf0e1b2f9500395be90167d3b6c237d13735 "@types/node@*", "@types/node@>= 8", "@types/node@~8.9.4": version "8.9.5" @@ -4653,14 +4644,11 @@ integrity sha512-NxxZZek50ylIACiXebKQYHD3D4One3WXOasEXWazL6aTfYbZob7ClNKxUpg8I4/oWArX87oPWvj1cHKqfel3Hg== dependencies: "@types/ws" "*" -<<<<<<< HEAD -======= - + "@types/semver@^7.3.10": version "7.3.10" resolved "https://registry.yarnpkg.com/@types/semver/-/semver-7.3.10.tgz#5f19ee40cbeff87d916eedc8c2bfe2305d957f73" integrity sha512-zsv3fsC7S84NN6nPK06u79oWgrPVd0NvOyqgghV1haPaFcVxIrP4DLomRwGAXk0ui4HZA7mOcSFL98sMVW9viw== ->>>>>>> 74becf0e1b2f9500395be90167d3b6c237d13735 "@types/source-list-map@*": version "0.1.2" @@ -11864,33 +11852,6 @@ glob@^7.1.3: version "7.1.3" resolved "https://registry.yarnpkg.com/glob/-/glob-7.1.3.tgz#3960832d3f1574108342dafd3a67b332c0969df1" integrity sha512-vcfuiIxogLV4DlGBHIUOwI0IbrJ8HWPc4MU7HzviGeNho/UJDfi6B5p3sHeWIQ0KGIU0Jpxi5ZHxemQfLkkAwQ== -<<<<<<< HEAD - dependencies: - fs.realpath "^1.0.0" - inflight "^1.0.4" - inherits "2" - minimatch "^3.0.4" - once "^1.3.0" - path-is-absolute "^1.0.0" - -glob@^7.2.3: - version "7.2.3" - resolved "https://registry.yarnpkg.com/glob/-/glob-7.2.3.tgz#b8df0fb802bbfa8e89bd1d938b4e16578ed44f2b" - integrity sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q== - dependencies: - fs.realpath "^1.0.0" - inflight "^1.0.4" - inherits "2" - minimatch "^3.1.1" - once "^1.3.0" - path-is-absolute "^1.0.0" - -glob@~7.1.7: - version "7.1.7" - resolved "https://registry.yarnpkg.com/glob/-/glob-7.1.7.tgz#3b193e9233f01d42d0b3f78294bbeeb418f94a90" - integrity sha512-OvD9ENzPLbegENnYP5UUfJIirTg4+XwMWGaQfQTY0JenxNvvIKP3U3/tAQSPIu/lHxXYSZmpXlUHeqAIdKzBLQ== -======= ->>>>>>> 74becf0e1b2f9500395be90167d3b6c237d13735 dependencies: fs.realpath "^1.0.0" inflight "^1.0.4" @@ -16943,17 +16904,10 @@ nice-try@^1.0.4: resolved "https://registry.yarnpkg.com/nice-try/-/nice-try-1.0.5.tgz#a3378a7696ce7d223e88fc9b764bd7ef1089e366" integrity sha512-1nh45deeb5olNY7eX82BkPO7SSxR5SSYJiPTrTdFUVYwAl8CKMA5N9PjTYkHiRjisVcxcQ1HXdLhx2qxxJzLNQ== -<<<<<<< HEAD -nightwatch@^2.2.2: - version "2.2.2" - resolved "https://registry.yarnpkg.com/nightwatch/-/nightwatch-2.2.2.tgz#ded0ad7425c5dc146f1668eb8404e19f49c784cd" - integrity sha512-tKEnIxElHlzvRfPqpfxZunE2fO64tdJtIogqF22yMKAru6IOpZTzEKQ+E/38hhkTv9jqtgGzkMNycm9nSPb6dQ== -======= nightwatch@^2.3: version "2.3.0" resolved "https://registry.yarnpkg.com/nightwatch/-/nightwatch-2.3.0.tgz#3f883b7ef0a34e98754028783d82c3641869a608" integrity sha512-JouglJuxReLoCWfwud6U6mKTqTlEapJZYEvFzsBZ8CDJ77jzaiBLkgbpSJ6nt51kHJRH+xZtdTTiKFNjX0vS8w== ->>>>>>> 74becf0e1b2f9500395be90167d3b6c237d13735 dependencies: "@nightwatch/chai" "5.0.2" ansi-to-html "^0.7.2" @@ -16969,10 +16923,7 @@ nightwatch@^2.3: glob "^7.2.3" lodash.clone "3.0.3" lodash.defaultsdeep "4.6.1" -<<<<<<< HEAD -======= lodash.escape "^4.0.1" ->>>>>>> 74becf0e1b2f9500395be90167d3b6c237d13735 lodash.merge "4.6.2" minimatch "3.0.4" minimist "1.2.6" @@ -16980,11 +16931,7 @@ nightwatch@^2.3: mocha "9.2.2" open "^8.4.0" ora "5.4.1" -<<<<<<< HEAD - selenium-webdriver "4.1.1" -======= selenium-webdriver "^4.3.1" ->>>>>>> 74becf0e1b2f9500395be90167d3b6c237d13735 semver "7.3.5" stacktrace-parser "^0.1.10" strip-ansi "6.0.1" @@ -20911,16 +20858,6 @@ selenium-standalone@^8.0.4: which "^2.0.2" yauzl "^2.10.0" -<<<<<<< HEAD -selenium-webdriver@4.1.1: - version "4.1.1" - resolved "https://registry.yarnpkg.com/selenium-webdriver/-/selenium-webdriver-4.1.1.tgz#da083177d811f36614950e809e2982570f67d02e" - integrity sha512-Fr9e9LC6zvD6/j7NO8M1M/NVxFX67abHcxDJoP5w2KN/Xb1SyYLjMVPGgD14U2TOiKe4XKHf42OmFw9g2JgCBQ== - dependencies: - jszip "^3.6.0" - tmp "^0.2.1" - ws ">=7.4.6" -======= selenium-webdriver@^4.3.1: version "4.3.1" resolved "https://registry.yarnpkg.com/selenium-webdriver/-/selenium-webdriver-4.3.1.tgz#5e9c6c4adee65e57776b5bd4c07c59b65b8f056d" @@ -20929,7 +20866,6 @@ selenium-webdriver@^4.3.1: jszip "^3.10.0" tmp "^0.2.1" ws ">=8.7.0" ->>>>>>> 74becf0e1b2f9500395be90167d3b6c237d13735 selenium@^2.20.0: version "2.20.0" @@ -24519,17 +24455,10 @@ ws@7.4.6: resolved "https://registry.yarnpkg.com/ws/-/ws-7.4.6.tgz#5654ca8ecdeee47c33a9a4bf6d28e2be2980377c" integrity sha512-YmhHDO4MzaDLB+M9ym/mDA5z0naX8j7SIlT8f8z+I0VtzsRbekxEutHSme7NPS2qE8StCYQNUnfWdXta/Yu85A== -<<<<<<< HEAD -ws@>=7.4.6: - version "8.8.0" - resolved "https://registry.yarnpkg.com/ws/-/ws-8.8.0.tgz#8e71c75e2f6348dbf8d78005107297056cb77769" - integrity sha512-JDAgSYQ1ksuwqfChJusw1LSJ8BizJ2e/vVu5Lxjq3YvNJNlROv1ui4i+c/kUUrPheBvQl4c5UbERhTwKa6QBJQ== -======= ws@>=8.7.0: version "8.8.1" resolved "https://registry.yarnpkg.com/ws/-/ws-8.8.1.tgz#5dbad0feb7ade8ecc99b830c1d77c913d4955ff0" integrity sha512-bGy2JzvzkPowEJV++hF07hAD6niYSr0JzBNo/J29WsB57A2r7Wlc1UFcTR9IzrPvuNVO4B8LGqF8qcpsVOhJCA== ->>>>>>> 74becf0e1b2f9500395be90167d3b6c237d13735 ws@^1.1.1: version "1.1.5"