mirror
/
remix-project
mirror of https://github.com/ethereum/remix-project.git
2
0
Fork 0
Code Issues Releases Wiki Activity

types and provider update

Browse Source
pull/4010/head
aniket-engg 1 year ago
parent 7c6d0b0b64
commit 5b5b0c2ba7
2 changed files with 9386 additions and 7118 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 152
      libs/remix-ui/editor/src/lib/providers/codeActionProvider.ts
  2. 16352
      libs/remix-ui/editor/src/types/monaco.ts

152
libs/remix-ui/editor/src/lib/providers/codeActionProvider.ts
Unescape View File

@ -1,9 +1,11 @@
import { Monaco } from "@monaco-editor/react"
import monaco from "../../types/monaco"
import { EditorUIProps } from "../remix-ui-editor"
import { default as fixesList } from "./quickfixes"
import {Monaco} from '@monaco-editor/react'
import monaco from '../../types/monaco'
import {EditorUIProps} from '../remix-ui-editor'
import {default as fixesList} from './quickfixes'
export class RemixCodeActionProvider implements monaco.languages.CodeActionProvider {
export class RemixCodeActionProvider
implements monaco.languages.CodeActionProvider
{
props: EditorUIProps
monaco: Monaco
constructor(props: any, monaco: any) {
@ -11,7 +13,7 @@ export class RemixCodeActionProvider implements monaco.languages.CodeActionProvi
this.monaco = monaco
}
async provideCodeActions (
async provideCodeActions(
model: monaco.editor.ITextModel,
range: monaco.Range,
context: monaco.languages.CodeActionContext,
@ -22,27 +24,70 @@ export class RemixCodeActionProvider implements monaco.languages.CodeActionProvi
let fixes: Record<string, any>[], msg: string
let isOldAST: boolean = false
const errStrings: string[] = Object.keys(fixesList)
const errStr:string = errStrings.find(es => error.message.includes(es))
const errStr: string = errStrings.find((es) => error.message.includes(es))
if (errStr) {
fixes = fixesList[errStr]
const cursorPosition: number = this.props.editorAPI.getHoverPosition({lineNumber: error.startLineNumber, column: error.startColumn})
const nodeAtPosition = await this.props.plugin.call('codeParser', 'definitionAtPosition', cursorPosition)
const cursorPosition: number = this.props.editorAPI.getHoverPosition({
lineNumber: error.startLineNumber,
column: error.startColumn
})
const nodeAtPosition = await this.props.plugin.call(
'codeParser',
'definitionAtPosition',
cursorPosition
)
// Check if a function is hovered
if (nodeAtPosition && nodeAtPosition.nodeType === "FunctionDefinition") {
if (
nodeAtPosition &&
nodeAtPosition.nodeType === 'FunctionDefinition'
) {
// Identify type of AST node
if (nodeAtPosition.parameters && !Array.isArray(nodeAtPosition.parameters) && Array.isArray(nodeAtPosition.parameters.parameters))
if (
nodeAtPosition.parameters &&
!Array.isArray(nodeAtPosition.parameters) &&
Array.isArray(nodeAtPosition.parameters.parameters)
)
isOldAST = true
const paramNodes = isOldAST ? nodeAtPosition.parameters.parameters : nodeAtPosition.parameters
const paramNodes = isOldAST
? nodeAtPosition.parameters.parameters
: nodeAtPosition.parameters
for (const fix of fixes) {
msg = paramNodes.length
? await this.fixForMethodWithParams(model, paramNodes, fix, error, isOldAST)
: await this.fixForMethodWithoutParams(model, nodeAtPosition, fix, error, isOldAST)
this.addQuickFix(actions, error, model.uri, {title: fix.title, range: fix.range, text: msg})
msg = paramNodes.length
? await this.fixForMethodWithParams(
model,
paramNodes,
fix,
error,
isOldAST
)
: await this.fixForMethodWithoutParams(
model,
nodeAtPosition,
fix,
error,
isOldAST
)
this.addQuickFix(actions, error, model.uri, {
id: fix.id,
title: fix.title,
range: fix.range,
text: msg
})
}
} else {
for (const fix of fixes) {
if (fix && nodeAtPosition && fix.nodeType !== nodeAtPosition.nodeType) continue
else this.addQuickFix(actions, error, model.uri, {title: fix.title, range: fix.range || error, text: fix.message})
if (
fix &&
nodeAtPosition &&
fix.nodeType !== nodeAtPosition.nodeType
)
continue
else
this.addQuickFix(actions, error, model.uri, {
title: fix.title,
range: fix.range || error,
text: fix.message
})
}
}
}
@ -61,17 +106,23 @@ export class RemixCodeActionProvider implements monaco.languages.CodeActionProvi
* @param uri model URI
* @param fix details of quick fix to apply
*/
addQuickFix(actions: monaco.languages.CodeAction[], error: monaco.editor.IMarkerData, uri: monaco.Uri, fix: Record<string, any>) {
const {title, range, text} = fix
addQuickFix(
actions: monaco.languages.CodeAction[],
error: monaco.editor.IMarkerData,
uri: monaco.Uri,
fix: Record<string, any>
) {
const {id, title, range, text} = fix
actions.push({
title,
diagnostics: [error],
kind: "quickfix",
kind: 'quickfix',
edit: {
edits: [
{
resource: uri,
edit: { range, text }
textEdit: {range, text},
versionId: id
}
]
},
@ -88,12 +139,22 @@ export class RemixCodeActionProvider implements monaco.languages.CodeActionProvi
* @param isOldAST true, if AST node contains legacy fields
* @returns message to be placed as quick fix
*/
async fixForMethodWithParams(model: monaco.editor.ITextModel, paramNodes: Record<string, any>[], fix: Record<string, any>, error: monaco.editor.IMarkerData, isOldAST: boolean): Promise<string> {
async fixForMethodWithParams(
model: monaco.editor.ITextModel,
paramNodes: Record<string, any>[],
fix: Record<string, any>,
error: monaco.editor.IMarkerData,
isOldAST: boolean
): Promise<string> {
let lastParamEndLoc: Record<string, any>, fixLineNumber: number, msg: string
// Get last function parameter node
const lastParamNode: Record<string, any> = paramNodes[paramNodes.length - 1]
if (isOldAST) {
const location: Record<string, any> = await this.props.plugin.call('codeParser', 'getLineColumnOfNode', lastParamNode)
const location: Record<string, any> = await this.props.plugin.call(
'codeParser',
'getLineColumnOfNode',
lastParamNode
)
// Get end location of last function parameter, it returns end column of parameter name
lastParamEndLoc = location.end
fixLineNumber = lastParamEndLoc.line + 1
@ -106,9 +167,21 @@ export class RemixCodeActionProvider implements monaco.languages.CodeActionProvi
if (fix.id === 5 && lineContent.includes(' view '))
msg = lineContent.replace('view', 'pure')
else if (isOldAST)
msg = lineContent.substring(0, lastParamEndLoc.column + 2) + fix.message + lineContent.substring(lastParamEndLoc.column + 1, lineContent.length)
else
msg = lineContent.substring(0, lastParamEndLoc.column + lastParamNode.name.length + 2) + fix.message + lineContent.substring(lastParamEndLoc.column + lastParamNode.name.length + 1, lineContent.length)
msg =
lineContent.substring(0, lastParamEndLoc.column + 2) +
fix.message +
lineContent.substring(lastParamEndLoc.column + 1, lineContent.length)
else
msg =
lineContent.substring(
0,
lastParamEndLoc.column + lastParamNode.name.length + 2
) +
fix.message +
lineContent.substring(
lastParamEndLoc.column + lastParamNode.name.length + 1,
lineContent.length
)
fix.range = {
startLineNumber: fixLineNumber,
@ -128,21 +201,34 @@ export class RemixCodeActionProvider implements monaco.languages.CodeActionProvi
* @param isOldAST true, if AST node contains legacy fields
* @returns message to be placed as quick fix
*/
async fixForMethodWithoutParams(model: monaco.editor.ITextModel, nodeAtPosition: Record<string, any>, fix: Record<string, any>, error: monaco.editor.IMarkerData, isOldAST: boolean): Promise<string> {
async fixForMethodWithoutParams(
model: monaco.editor.ITextModel,
nodeAtPosition: Record<string, any>,
fix: Record<string, any>,
error: monaco.editor.IMarkerData,
isOldAST: boolean
): Promise<string> {
let fixLineNumber: number, msg: string
if (isOldAST) {
const location: Record<string, any> = await this.props.plugin.call('codeParser', 'getLineColumnOfNode', nodeAtPosition)
const location: Record<string, any> = await this.props.plugin.call(
'codeParser',
'getLineColumnOfNode',
nodeAtPosition
)
fixLineNumber = location.start.line + 1
} else fixLineNumber = nodeAtPosition.loc.start.line
const lineContent: string = model.getLineContent(fixLineNumber)
const i: number = lineContent.indexOf('()')
if (fix.id === 5 && lineContent.includes(' view ')) {
msg = lineContent.replace('view', 'pure')
} else
msg = lineContent.substring(0, i + 3) + fix.message + lineContent.substring(i + 3, lineContent.length)
msg =
lineContent.substring(0, i + 3) +
fix.message +
lineContent.substring(i + 3, lineContent.length)
fix.range = {
startLineNumber: fixLineNumber,
endLineNumber: fixLineNumber,
@ -151,4 +237,4 @@ export class RemixCodeActionProvider implements monaco.languages.CodeActionProvi
}
return msg
}
}
}

16352
libs/remix-ui/editor/src/types/monaco.ts
View File

File diff suppressed because it is too large Load Diff
Write Preview
Loading…
Cancel
Save