Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

initial code suggestion support for vyper and circom #5767

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 10 additions & 0 deletions libs/remix-ui/editor/src/lib/remix-ui-editor.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ import { solidityTokensProvider, solidityLanguageConfig } from './syntaxes/solid
import { cairoTokensProvider, cairoLanguageConfig } from './syntaxes/cairo'
import { zokratesTokensProvider, zokratesLanguageConfig } from './syntaxes/zokrates'
import { moveTokenProvider, moveLanguageConfig } from './syntaxes/move'
import { vyperTokenProvider, vyperLanguageConfig } from './syntaxes/vyper'
import { tomlLanguageConfig, tomlTokenProvider } from './syntaxes/toml'
import { monacoTypes } from '@remix-ui/editor'
import { loadTypes } from './web-types'
Expand Down Expand Up @@ -369,6 +370,8 @@ export const EditorUI = (props: EditorUIProps) => {
monacoRef.current.editor.setModelLanguage(file.model, 'remix-toml')
} else if (file.language === 'noir') {
monacoRef.current.editor.setModelLanguage(file.model, 'remix-noir')
} else if (file.language === 'python') {
monacoRef.current.editor.setModelLanguage(file.model, 'remix-vyper')
}
}, [props.currentFile, props.isDiff])

Expand Down Expand Up @@ -1011,6 +1014,7 @@ export const EditorUI = (props: EditorUIProps) => {
monacoRef.current.languages.register({ id: 'remix-zokrates' })
monacoRef.current.languages.register({ id: 'remix-move' })
monacoRef.current.languages.register({ id: 'remix-circom' })
monacoRef.current.languages.register({ id: 'remix-vyper' })
monacoRef.current.languages.register({ id: 'remix-toml' })
monacoRef.current.languages.register({ id: 'remix-noir' })

Expand All @@ -1035,6 +1039,7 @@ export const EditorUI = (props: EditorUIProps) => {

monacoRef.current.languages.setMonarchTokensProvider('remix-circom', circomTokensProvider as any)
monacoRef.current.languages.setLanguageConfiguration('remix-circom', circomLanguageConfig(monacoRef.current) as any)
monacoRef.current.languages.registerInlineCompletionsProvider('remix-circom', inlineCompletionProvider)

monacoRef.current.languages.setMonarchTokensProvider('remix-toml', tomlTokenProvider as any)
monacoRef.current.languages.setLanguageConfiguration('remix-toml', tomlLanguageConfig as any)
Expand All @@ -1050,6 +1055,11 @@ export const EditorUI = (props: EditorUIProps) => {
monacoRef.current.languages.registerInlineCompletionsProvider('remix-solidity', inlineCompletionProvider)
monaco.languages.registerCodeActionProvider('remix-solidity', new RemixCodeActionProvider(props, monaco))

monacoRef.current.languages.setMonarchTokensProvider('remix-vyper', vyperTokenProvider as any)
monacoRef.current.languages.setLanguageConfiguration('remix-vyper', vyperLanguageConfig as any)
monacoRef.current.languages.registerCompletionItemProvider('remix-vyper', new RemixCompletionProvider(props, monaco))
monacoRef.current.languages.registerInlineCompletionsProvider('remix-vyper', inlineCompletionProvider)

loadTypes(monacoRef.current)
}

Expand Down
75 changes: 75 additions & 0 deletions libs/remix-ui/editor/src/lib/syntaxes/vyper.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,75 @@
export const vyperLanguageConfig = {
comments: {
lineComment: "#",
},
brackets: [
["{", "}"],
["[", "]"],
["(", ")"],
],
autoClosingPairs: [
{ open: "[", close: "]" },
{ open: "{", close: "}" },
{ open: "(", close: ")" },
{ open: "'", close: "'", notIn: ["string"] },
{ open: '"', close: '"', notIn: ["string"] },
],
surroundingPairs: [
{ open: "{", close: "}" },
{ open: "[", close: "]" },
{ open: "(", close: ")" },
{ open: "'", close: "'" },
{ open: '"', close: '"' },
],
};

export const vyperTokenProvider = {
keywords: [
"contract", "def", "if", "elif", "else", "for", "while", "break", "continue", "return", "assert", "pass", "log", "struct",
"event", "indexed", "public", "private", "pure", "view", "payable", "nonpayable", "external", "internal", "self", "send",
"call", "delegatecall", "transfer", "mod", "range", "True", "False", "None",
],

typeKeywords: [
"address", "bool", "bytes", "bytes32", "decimal", "int128", "uint256", "string", "mapping", "immutable",
],

operators: [
"=", "+", "-", "*", "/", "%", "**", "//", "&", "|", "^", "~", "<<", ">>", "+=", "-=", "*=", "/=", "%=", "**=", "//=",
"&=", "|=", "^=", "<<=", ">>=", "==", "!=", "<", "<=", ">", ">=", "and", "or", "not",
],

symbols: /[=><!~?:&|+\-*\/^%]+/,

escapes: /\\(?:[abfnrtv\\"']|x[0-9A-Fa-f]{2}|u[0-9A-Fa-f]{4})/,

tokenizer: {
root: [
[/[a-zA-Z_$][\w$]*/, {
cases: {
"@typeKeywords": "type.identifier",
"@keywords": "keyword",
"@default": "variable",
},
}],
[/[{}()\[\]]/, "@brackets"],
[/@symbols/, { cases: { "@operators": "operator", "@default": "" } }],
[/\d*\.\d+([eE][\-+]?\d+)?/, "number.float"],
[/0[xX][0-9a-fA-F]+/, "number.hex"],
[/\d+/, "number"],
[/[;,.]/, "delimiter"],
[/"([^"\\]|\\.)*$/, "string.invalid"],
[/"/, { token: "string.quote", bracket: "@open", next: "@string" }],
[/'[^\\']'/, "string"],
[/(')(@escapes)(')/, ["string", "string.escape", "string"]],
[/'/, "string.invalid"],
[/#[^\n]*/, "comment"],
],
string: [
[/[^\\"]+/, "string"],
[/@escapes/, "string.escape"],
[/\./, "string.escape.invalid"],
[/"/, { token: "string.quote", bracket: "@close", next: "@pop" }],
],
},
};
2 changes: 1 addition & 1 deletion libs/remix-ui/tabs/src/lib/remix-ui-tabs.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -305,7 +305,7 @@ export const TabsUI = (props: TabsUIProps) => {
data-id="remix_ai_switch"
id='remix_ai_switch'
className="btn ai-switch text-ai pl-2 pr-0 py-0"
disabled={!(tabsState.currentExt === 'sol')}
disabled={!((tabsState.currentExt === 'sol') || (tabsState.currentExt === 'vy') || (tabsState.currentExt === 'circom') )}
onClick={async () => {
await props.plugin.call('settings', 'updateCopilotChoice', !ai_switch)
setAI_switch(!ai_switch)
Expand Down