Skip to content

Commit

Permalink
Add types for save + drop reference
Browse files Browse the repository at this point in the history
  • Loading branch information
@fdodino
fdodino committed Dec 26, 2024
1 parent 5489ac1 commit 592c692
Show file tree
Hide file tree
Showing 2 changed files with 78 additions and 38 deletions.
81 changes: 44 additions & 37 deletions packages/client/src/highlighter/tokenProvider.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,22 @@ import { WollokNodePlotter } from './utils'
import { plotter, keywords, tokenTypeObj } from './definition'
import { Assignment, Class, Describe, Field, If, Import, Literal, match, Method, Node, Package, Parameter, Program, Reference, Return, Send, Singleton, Test, Variable, when } from 'wollok-ts'

type NodeContext = {
name: string,
type: string
}

type ProcesamientoComentario = {
result: WollokNodePlotter[];
multilinea?: {
ln: number,
col: number,
len: number
}[]
firstLineMC?: number;
presetIndex?: number;
}

type NamedNode = Node & { name: string }

type LineResult = {
Expand All @@ -10,6 +26,13 @@ type LineResult = {
word: string,
}

export type HighlightingResult = {
result: WollokNodePlotter[];
references: NodeContext | NodeContext[];
}

/* ============================================================================ */

function getLine(node: Node, documentLines: string[]): LineResult {
const start = node.sourceMap.start
const line = start.line - 1
Expand All @@ -34,8 +57,9 @@ function processNode(node: Node, documentoStr: string[], context: NodeContext[])
return plotter({ ln: line, col, len: token.length }, kind)
}

const saveReference = node => { return { name: node.name, type: node.kind }}
const dropReference = node => { return { result: node, references: undefined }}
const saveReference = (node: NamedNode) => ({ name: node.name, type: node.kind })
const dropSingleReference = (node: WollokNodePlotter): HighlightingResult => dropReference([node])
const dropReference = (node: WollokNodePlotter[]): HighlightingResult => ({ result: node, references: undefined })

const resultForReference = (node: Variable | Field) => {
const result = [
Expand All @@ -53,13 +77,13 @@ function processNode(node: Node, documentoStr: string[], context: NodeContext[])
}

if(node.kind === 'New' || node.kind === 'Self'){ //por alguna razon no hace match
return dropReference(keywordPlotter(node, keywords[node.kind]))
return dropSingleReference(keywordPlotter(node, keywords[node.kind]))
}
if (node.is(If)) {
const if_keywords = [keywordPlotter(node, keywords[node.kind])]
const ifKeywords = [keywordPlotter(node, keywords[node.kind])]
// if(node.elseBody)
// if_keywords.push(keyword_plotter(node, keywords['Else']))
return dropReference(if_keywords)
return dropReference(ifKeywords)
}
if (node.is(Describe) || node.is(Test)) {
return dropReference([
Expand All @@ -78,11 +102,15 @@ function processNode(node: Node, documentoStr: string[], context: NodeContext[])
}),
when(Singleton)(node => {
if (node.sourceMap == undefined) return nullHighlighting
const currentNode = {
...node,
name: node.name ?? '',
} as unknown as NamedNode
const acum = []
node.members.reduce((prev, curr) => !curr.name.startsWith('<') && prev, true)
&& acum.push(keywordPlotter(node, keywords[node.kind]))
if (node.name) acum.push(generatePlotter(node as unknown as NamedNode))
return { result: acum, references: saveReference(node) }
return { result: acum, references: saveReference(currentNode) }
}),
when(Field)(node =>
node.isSynthetic ? nullHighlighting : resultForReference(node)
Expand Down Expand Up @@ -149,21 +177,21 @@ function processNode(node: Node, documentoStr: string[], context: NodeContext[])
col: column + col_offset,
len: idx_negate == -1? 3: 1,
}, node.kind)
return dropReference(plotKeyboard)
return dropSingleReference(plotKeyboard)
}
const col = column + word.indexOf(node.message)
const plotKeyboard = plotter({ ln: line, col, len: node.message.length }, node.kind)
return dropReference(plotKeyboard)
return dropSingleReference(plotKeyboard)
}
//if(keywords.Send.includes(node.message)) return null_case
const col = column + word.indexOf(node.message)
return {
result: plotter({ ln: line, col, len: node.message.length }, 'Method'), //node.kind)
result: [plotter({ ln: line, col, len: node.message.length }, 'Method')], //node.kind)
references: undefined,
}
}),
when(Return)(node => {
return dropReference(keywordPlotter(node, keywords[node.kind]))
return dropSingleReference(keywordPlotter(node, keywords[node.kind]))
}),
when(Literal)(node => {
if(node.isSynthetic) return nullHighlighting
Expand All @@ -184,21 +212,21 @@ function processNode(node: Node, documentoStr: string[], context: NodeContext[])
case 'number':
case 'bigint':
const valor_numerico = node.value.toString()
return dropReference(plotter({
return dropSingleReference(plotter({
ln: line,
col: column + word.indexOf(valor_numerico),
len: valor_numerico.length,
}, 'Literal_number'))
case 'boolean':
const valor_booleano = node.value.toString()
return dropReference(plotter({
return dropSingleReference(plotter({
ln: line,
col: column + word.indexOf(valor_booleano),
len: valor_booleano.length,
}, 'Literal_bool'))
case 'string':
const valor_string = node.value.toString()
return dropReference(plotter({
return dropSingleReference(plotter({
ln: line,
col: column + word.indexOf(valor_string) - 1,
len: valor_string.length + 2,
Expand Down Expand Up @@ -235,28 +263,18 @@ function processNode(node: Node, documentoStr: string[], context: NodeContext[])
])
}),
when(Describe)(node => {
return dropReference(keywordPlotter(node, keywords[node.kind]))
return dropSingleReference(keywordPlotter(node, keywords[node.kind]))
}),
when(Test)(node => {
return dropReference(keywordPlotter(node, keywords[node.kind]))
return dropSingleReference(keywordPlotter(node, keywords[node.kind]))
}),
when(If)(node => {
return dropReference(keywordPlotter(node, keywords[node.kind]))
return dropSingleReference(keywordPlotter(node, keywords[node.kind]))
}),
when(Node)(_ => nullHighlighting)
)
}

type NodeContext = {
name: string,
type: string
}

export type HighlightingResult = {
result: WollokNodePlotter[];
references: NodeContext | NodeContext[];
}

export function processCode(node: Node, documentoStr: string[]): WollokNodePlotter[] {
return node.reduce((acum, node: Node) =>
{
Expand All @@ -274,17 +292,6 @@ function plotterMultiLinea(arr: any[]) {
return arr.map( x => plotter(x, 'Comment'))
}

type ProcesamientoComentario = {
result: WollokNodePlotter[];
multilinea?: {
ln: number,
col: number,
len: number
}[]
firstLineMC?: number;
presetIndex?: number;
}

export function processComments(docText: string[]): WollokNodePlotter[] {
return docText.reduce( processCommentLine, { result:[], multilinea:undefined }).result

Expand Down
35 changes: 34 additions & 1 deletion packages/client/src/test/highlighter/tokenProvider.test.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ suite('an object sample', () => {
})

test('highlights object keyword', () => {
console.info(JSON.stringify(processed.filter(token => token.tokenType === 'keyword')))
const keywordsTokens = processed.filter(token => token.tokenType === 'keyword').values()

const nextRange = () => keywordsTokens.next().value.range
Expand Down Expand Up @@ -143,7 +144,6 @@ suite('a class sample', () => {
})

test('highlights property name', () => {
console.info(JSON.stringify(processed.filter(token => token.tokenType === 'property')))
const propertyTokens = processed.filter(token => token.tokenType === 'property').values()

const nextRange = () => propertyTokens.next().value.range
Expand All @@ -169,4 +169,37 @@ suite('a class sample', () => {
expect(birthdateInIsYoungMethodRange.end).toEqual({ line: 9, column: 49 })
})

test('highlights methods name', () => {
const methodTokens = processed.filter(token => token.tokenType === 'method').values()

const nextRange = () => methodTokens.next().value.range

const flyMethodRange = nextRange()
expect(flyMethodRange.start).toEqual({ line: 4, column: 9 })
expect(flyMethodRange.end).toEqual({ line: 4, column: 12 })

const isYoungMethodRange = nextRange()
expect(isYoungMethodRange.start).toEqual({ line: 8, column: 9 })
expect(isYoungMethodRange.end).toEqual({ line: 8, column: 16 })

const differenceMessageRange = nextRange()
expect(differenceMessageRange.start).toEqual({ line: 9, column: 29 })
expect(differenceMessageRange.end).toEqual({ line: 9, column: 39 })
})

test('highlights parameters', () => {
const parameterTokens = processed.filter(token => token.tokenType === 'parameter').values()

const nextRange = () => parameterTokens.next().value.range

const minutesParameterRange = nextRange()
expect(minutesParameterRange.start).toEqual({ line: 4, column: 13 })
expect(minutesParameterRange.end).toEqual({ line: 4, column: 20 })

const minutesUsageParameterRange = nextRange()
expect(minutesUsageParameterRange.start).toEqual({ line: 5, column: 28 })
expect(minutesUsageParameterRange.end).toEqual({ line: 5, column: 35 })
})


})

0 comments on commit 592c692

Please sign in to comment.