Skip to content

B
baas-ide
Commit 9aaa9135 authored by Aniket-Engg's avatar Aniket-Engg Committed by Aniket
Browse files
Options

npm imports working without location

parent d2184ccd
Hide whitespace changes
Inline Side-by-side
Showing with 21 additions and 18 deletions
libs/remix-ui/static-analyser/src/lib/remix-ui-static-analyser.tsx
View file @ 9aaa9135
...@@ -201,22 +201,24 @@ export const RemixUiStaticAnalyser = (props: RemixUiStaticAnalyserProps) => { ...@@ -201,22 +201,24 @@ export const RemixUiStaticAnalyser = (props: RemixUiStaticAnalyserProps) => {
let column = 0 let column = 0
let row = 0 let row = 0
let fileName = currentFile let fileName = currentFile
if (item.sourceMap && item.sourceMap.length) { // There are issues with location for imported contract
location = { // which stops complete analysis including remix analyzer's
start: item.sourceMap[0].source_mapping.start, // if (item.sourceMap && item.sourceMap.length) {
length: item.sourceMap[0].source_mapping.length // location = {
} // start: item.sourceMap[0].source_mapping.start,
location = props.analysisModule._deps.offsetToLineColumnConverter.offsetToLineColumn( // length: item.sourceMap[0].source_mapping.length
location, // }
Object.keys(lastCompilationResult.sources).indexOf(item.sourceMap[0].source_mapping.filename_relative), // location = props.analysisModule._deps.offsetToLineColumnConverter.offsetToLineColumn(
lastCompilationSource.sources, // location,
lastCompilationResult.sources // Object.keys(lastCompilationResult.sources).indexOf(item.sourceMap[0].source_mapping.filename_relative),
) // lastCompilationSource.sources,
row = location.start.line // lastCompilationResult.sources
column = location.start.column // )
locationString = row + 1 + ':' + column + ':' // row = location.start.line
fileName = Object.keys(lastCompilationResult.contracts)[0] // column = location.start.column
} // locationString = row + 1 + ':' + column + ':'
// fileName = Object.keys(lastCompilationResult.contracts)[0]
// }
warningCount++ warningCount++
const msg = message(item.title, item.description, item.more, fileName, locationString) const msg = message(item.title, item.description, item.more, fileName, locationString)
const options = { const options = {
......
libs/remixd/src/services/slitherClient.ts
View file @ 9aaa9135
...@@ -127,9 +127,10 @@ export class SlitherClient extends PluginClient { ...@@ -127,9 +127,10 @@ export class SlitherClient extends PluginClient {
const solcRemaps = remaps ? `--solc-remaps "${remaps}"` : '' const solcRemaps = remaps ? `--solc-remaps "${remaps}"` : ''
const cmd: string = `slither ${filePath} ${solcArgs} ${solcRemaps} --json ${outputFile}` const cmd: string = `slither ${filePath} ${solcArgs} ${solcRemaps} --json ${outputFile}`
console.log('command--->', cmd)
console.log('\x1b[32m%s\x1b[0m', '[Slither Analysis]: Running Slither...') console.log('\x1b[32m%s\x1b[0m', '[Slither Analysis]: Running Slither...')
const child = spawn(cmd, options) // Added `stdio: 'ignore'` as for contract with NPM imports analysis which is exported in 'stderr'
// get too big and hangs the process. We process analysis from the report file only
const child = spawn(cmd, { cwd: this.currentSharedFolder, shell: true, stdio: 'ignore' })
const response = {} const response = {}
child.on('close', () => { child.on('close', () => {
const outputFileAbsPath: string = `${this.currentSharedFolder}/${outputFile}` const outputFileAbsPath: string = `${this.currentSharedFolder}/${outputFile}`
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment