core: fix match poistion for python

jayu · jayu · commit 757edac94f4b · 2023-07-25T19:23:53.000+02:00
diff --git a/.eslintrc.js b/.eslintrc.js
@@ -1,6 +1,6 @@
 module.exports = {
   parser: '@typescript-eslint/parser',
-  plugins: ['@typescript-eslint', 'node', 'prettier'],
+  plugins: ['@typescript-eslint', 'node', 'prettier', '@codeque'],
   extends: [
     'eslint:recommended',
     'plugin:@typescript-eslint/recommended',
@@ -58,5 +58,13 @@ module.exports = {
         next: '*',
       }, // padding after multiline-expression
     ],
+    '@codeque/error': [
+      'error',
+      [
+        {
+          query: 'console.log()',
+        },
+      ],
+    ],
   },
 }
diff --git a/package.json b/package.json
@@ -32,5 +32,8 @@
     "checks": "yarn typecheck && yarn lint && yarn test",
     "postinstall": "node fix-framer-motion.js",
     "syncReadmes": "node ./syncReadmes.js"
+  },
+  "dependencies": {
+    "@codeque/eslint-plugin": "^0.1.1"
   }
 }
diff --git a/packages/cli/src/dev.ts b/packages/cli/src/dev.ts
@@ -1,3 +1,4 @@
+/* eslint-disable @codeque/error */
 import {
   getMode,
   Mode,
diff --git a/packages/core/__tests__/Python/matchCodePatterns/basic.test.ts b/packages/core/__tests__/Python/matchCodePatterns/basic.test.ts
@@ -1,5 +1,5 @@
 import { searchInStrings } from '../../../src/searchInStrings'
-import { getParserSettings } from '../../utils'
+import { getParserSettings, compareCode } from '../../utils'
 
 describe('Basic queries', () => {
   beforeAll(async () => {
@@ -118,8 +118,17 @@ describe('Basic queries', () => {
     expect(errors).toHaveLength(0)
     expect(matches.length).toBe(1)
 
-    expect(matches[0].aliases.identifierAliasesMap['refPrint'].aliasValue).toBe(
+    const match = matches[0]
+
+    expect(match.aliases.identifierAliasesMap['refPrint'].aliasValue).toBe(
       'print',
     )
+
+    expect(compareCode(fileContent, match.code)).toBe(true)
+
+    expect(match.loc).toStrictEqual({
+      start: { line: 2, column: 6, index: 7 },
+      end: { line: 7, column: 15, index: 131 },
+    })
   })
 })
diff --git a/packages/core/src/parserSettings/python/settings.ts b/packages/core/src/parserSettings/python/settings.ts
@@ -99,8 +99,8 @@ const programNodeAndBlockNodeUtils: ProgramNodeAndBlockNodeUtils = {
 const getNodePosition: ParserSettings['getNodePosition'] = (
   node: PoorNodeType,
 ) => ({
-  start: ((node?.loc as any)?.startIndex as number) ?? 0,
-  end: ((node?.loc as any)?.endIndex as number) ?? 0,
+  start: ((node?.loc as any)?.start?.index as number) ?? 0,
+  end: ((node?.loc as any)?.end?.index as number) ?? 0,
   loc: node.loc as unknown as Location,
 })
 
@@ -181,5 +181,9 @@ export default pythonParser
 
 /**
  * TODOs:
- * Check how types structure is represented and whether our fields cache is breaking the types matching
+ * - Check how types structure is represented and whether our fields cache is breaking the types matching
+ * - Support string interpolation `f"project:{self.project_id}:rules"`
+ *   - We need to extract string literals and interpolated expressions to node
+ * - support detecting python in search from selection
+ * -
  */
diff --git a/packages/core/src/searchMultiThread.ts b/packages/core/src/searchMultiThread.ts
@@ -92,9 +92,12 @@ export const searchMultiThread = async ({
             })
             resolve(results)
           } catch (e) {
-            reject(
+            const error = new Error(
               'Search on main thread failed with error ' + (e as Error).message,
             )
+            error.stack = (e as Error)?.stack
+
+            reject(error)
           }
         }, 0)
       } else {
diff --git a/packages/core/src/searchStages/matchStringOrIdentifierAliases.ts b/packages/core/src/searchStages/matchStringOrIdentifierAliases.ts
@@ -92,12 +92,6 @@ export const matchStringOrIdentifierAliases = ({
     )
 
     if (wildcardValuesExtractionMatch === null) {
-      console.log(
-        'wildcardValuesExtractionRegex',
-        wildcardValuesExtractionRegex,
-      )
-
-      console.log('fileNodeIdentifierName', fileNodeIdentifierName)
       throw new Error(
         'Wildcard alias extraction RegExp did not match, thus it was build incorrectly.',
       )
diff --git a/packages/core/src/searchStages/searchAst.ts b/packages/core/src/searchStages/searchAst.ts
@@ -45,7 +45,7 @@ export const searchAst = (
 
         return queryCode.substring(pos.start, pos.end)
       } catch {
-        console.log('Failed getting position for node', node)
+        console.error('Failed getting position for node', node)
       }
 
       return ''
diff --git a/packages/eslint/src/lintCode.ts b/packages/eslint/src/lintCode.ts
@@ -33,18 +33,19 @@ let filteringFilePathsTime = 0
 const searchTimeForQueries = {} as Record<string, number>
 
 process.on('beforeExit', () => {
+  const print = console.log
   const shouldPrintMetric = process.env.CODEQUE_DEBUG === 'true'
 
   if (shouldPrintMetric) {
-    console.log('\nCodeQue debug metrics:\n')
-    console.log('preparationTime', preparationTime)
-    console.log('shallowSearchTime', shallowSearchTime)
-    console.log('preparingVisitorsTime', preparingVisitorsTime)
-    console.log('preparingQueriesTime', preparingQueriesTime)
-    console.log('filteringFilePathsTime', filteringFilePathsTime)
-    console.log('searchTimeForQueries', searchTimeForQueries)
-    console.log('')
-    console.log('Telemetry is', telemetryDisabled ? 'disabled' : 'enabled')
+    print('\nCodeQue debug metrics:\n')
+    print('preparationTime', preparationTime)
+    print('shallowSearchTime', shallowSearchTime)
+    print('preparingVisitorsTime', preparingVisitorsTime)
+    print('preparingQueriesTime', preparingQueriesTime)
+    print('filteringFilePathsTime', filteringFilePathsTime)
+    print('searchTimeForQueries', searchTimeForQueries)
+    print('')
+    print('Telemetry is', telemetryDisabled ? 'disabled' : 'enabled')
   }
 })
 
diff --git a/packages/vscode/src/EventBus.ts b/packages/vscode/src/EventBus.ts
@@ -108,14 +108,11 @@ export class EventBus {
     data?: EventTypes[T],
     dispatchThroughTransports = true,
   ) => {
-    console.log(`dispatch:${this.env}`, eventType, data)
-
     try {
       await Promise.all(
         this.listeners[eventType].map((callback) => callback(data)),
       )
     } catch (e) {
-      console.log(this.env, 'Dispatch error')
       console.error(this.env, 'internal dispatch error', e)
     }
 
@@ -139,8 +136,6 @@ export class EventBus {
           }),
         )
       } catch (e) {
-        console.log(this.env, 'Dispatch transports error')
-
         console.error(
           this.env,
           'transports dispatch error',
diff --git a/packages/vscode/src/SearchManager.ts b/packages/vscode/src/SearchManager.ts
@@ -533,7 +533,7 @@ export class SearchManager {
         'Search error: ' + error?.message + '\n\nStack:\n' + error?.stack,
       )
 
-      console.error(error)
+      console.error(typeof error, error, error.stack, error.message)
 
       const searchTime = (Date.now() - searchStart) / 1000
 
diff --git a/packages/vscode/src/extension.ts b/packages/vscode/src/extension.ts
@@ -116,7 +116,11 @@ export function activate(context: vscode.ExtensionContext) {
           canParseCodeForFileType = parseOk
         } catch (e) {
           canParseCodeForFileType = false
-          console.log('Error while parsing query for search from selection', e)
+
+          console.error(
+            'Error while parsing query for search from selection',
+            e,
+          )
         }
       }
 
diff --git a/packages/vscode/src/telemetry.ts b/packages/vscode/src/telemetry.ts
@@ -11,16 +11,15 @@ export const activateReporter = (): {
   nativeReporter: TelemetryReporter | null
   telemetryModule: TelemetryModule
 } => {
-  // TODO re-enable telemetry
-  //if (process.env.NODE_ENV !== 'production') {
-  return {
-    nativeReporter: null,
-    telemetryModule: {
-      reportSearch: () => undefined,
-      reportSearchError: () => undefined,
-    },
+  if (process.env.NODE_ENV !== 'production') {
+    return {
+      nativeReporter: null,
+      telemetryModule: {
+        reportSearch: () => undefined,
+        reportSearchError: () => undefined,
+      },
+    }
   }
-  //}
 
   const nativeReporter = new TelemetryReporter(
     applicationInsightsInstrumentationKey,
diff --git a/packages/vscode/src/webviews/SearchResultsPanel/components/usePreventScrollJump.ts b/packages/vscode/src/webviews/SearchResultsPanel/components/usePreventScrollJump.ts
@@ -6,10 +6,7 @@ export const usePreventScrollJump = (
   scrollElRef: MutableRefObject<HTMLDivElement | null>,
 ) => {
   return useCallback(() => {
-    console.log('preventing scroll jump pre check')
-
     if (wrapperRef.current && headingRef.current && scrollElRef.current) {
-      console.log('preventing scroll jump')
       const wrapperTop = wrapperRef.current.getBoundingClientRect().top
       const headingTop = headingRef.current.getBoundingClientRect().top
 
diff --git a/yarn.lock b/yarn.lock

Original file line number	Diff line number	Diff line change
`@@ -32,5 +32,8 @@`
`32`	`32`	`"checks": "yarn typecheck && yarn lint && yarn test",`
`33`	`33`	`"postinstall": "node fix-framer-motion.js",`
`34`	`34`	`"syncReadmes": "node ./syncReadmes.js"`
	`35`	`+ },`
	`36`	`+ "dependencies": {`
	`37`	`+ "@codeque/eslint-plugin": "^0.1.1"`
`35`	`38`	`}`
`36`	`39`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,4 @@`
	`1`	`+/* eslint-disable @codeque/error */`
`1`	`2`	`import {`
`2`	`3`	`getMode,`
`3`	`4`	`Mode,`
Original file line number	Diff line number	Diff line change
`@@ -92,9 +92,12 @@ export const searchMultiThread = async ({`
`92`	`92`	`})`
`93`	`93`	`resolve(results)`
`94`	`94`	`} catch (e) {`
`95`		`- reject(`
	`95`	`+ const error = new Error(`
`96`	`96`	`'Search on main thread failed with error ' + (e as Error).message,`
`97`	`97`	`)`
	`98`	`+ error.stack = (e as Error)?.stack`
	`99`	`+`
	`100`	`+ reject(error)`
`98`	`101`	`}`
`99`	`102`	`}, 0)`
`100`	`103`	`} else {`
Original file line number	Diff line number	Diff line change
`@@ -92,12 +92,6 @@ export const matchStringOrIdentifierAliases = ({`
`92`	`92`	`)`
`93`	`93`
`94`	`94`	`if (wildcardValuesExtractionMatch === null) {`
`95`		`- console.log(`
`96`		`- 'wildcardValuesExtractionRegex',`
`97`		`- wildcardValuesExtractionRegex,`
`98`		`- )`
`99`		`-`
`100`		`- console.log('fileNodeIdentifierName', fileNodeIdentifierName)`
`101`	`95`	`throw new Error(`
`102`	`96`	`'Wildcard alias extraction RegExp did not match, thus it was build incorrectly.',`
`103`	`97`	`)`
Original file line number	Diff line number	Diff line change
`@@ -45,7 +45,7 @@ export const searchAst = (`
`45`	`45`
`46`	`46`	`return queryCode.substring(pos.start, pos.end)`
`47`	`47`	`} catch {`
`48`		`- console.log('Failed getting position for node', node)`
	`48`	`+ console.error('Failed getting position for node', node)`
`49`	`49`	`}`
`50`	`50`
`51`	`51`	`return ''`