diff options
author | Kristóf Marussy <kristof@marussy.com> | 2021-11-05 19:17:30 +0100 |
---|---|---|
committer | Kristóf Marussy <kristof@marussy.com> | 2021-11-05 19:17:30 +0100 |
commit | 10df138d6084000659626aaf50afb16e6b674b25 (patch) | |
tree | 6769f681ff339e0796e2ca43525df3e58b6fc6db /language-web/src/main | |
parent | fix(lang): make default and scope non-contextual (diff) | |
download | refinery-10df138d6084000659626aaf50afb16e6b674b25.tar.gz refinery-10df138d6084000659626aaf50afb16e6b674b25.tar.zst refinery-10df138d6084000659626aaf50afb16e6b674b25.zip |
chore(web): implicit completion info in grammar
Move information about which tokens should support implicit completions
into the Lezer grammar.
Diffstat (limited to 'language-web/src/main')
-rw-r--r-- | language-web/src/main/js/language/problem.grammar | 10 | ||||
-rw-r--r-- | language-web/src/main/js/language/props.ts | 7 | ||||
-rw-r--r-- | language-web/src/main/js/xtext/ContentAssistService.ts | 15 |
3 files changed, 18 insertions, 14 deletions
diff --git a/language-web/src/main/js/language/problem.grammar b/language-web/src/main/js/language/problem.grammar index 86cc7722..8e39243f 100644 --- a/language-web/src/main/js/language/problem.grammar +++ b/language-web/src/main/js/language/problem.grammar | |||
@@ -1,3 +1,7 @@ | |||
1 | @detectDelim | ||
2 | |||
3 | @external prop implicitCompletion from '../../../../src/main/js/language/props.ts' | ||
4 | |||
1 | @top Problem { statement* } | 5 | @top Problem { statement* } |
2 | 6 | ||
3 | statement { | 7 | statement { |
@@ -89,11 +93,11 @@ VariableName { QualifiedName } | |||
89 | 93 | ||
90 | NodeName { QualifiedName } | 94 | NodeName { QualifiedName } |
91 | 95 | ||
92 | QualifiedName { identifier ("::" identifier)* } | 96 | QualifiedName[implicitCompletion=true] { identifier ("::" identifier)* } |
93 | 97 | ||
94 | kw<term> { @specialize[@name={term}]<identifier, term> } | 98 | kw<term> { @specialize[@name={term},implicitCompletion=true]<identifier, term> } |
95 | 99 | ||
96 | ckw<term> { @extend[@name={term}]<identifier, term> } | 100 | ckw<term> { @extend[@name={term},implicitCompletion=true]<identifier, term> } |
97 | 101 | ||
98 | ParameterList<content> { "(" sep<",", content> ")" } | 102 | ParameterList<content> { "(" sep<",", content> ")" } |
99 | 103 | ||
diff --git a/language-web/src/main/js/language/props.ts b/language-web/src/main/js/language/props.ts new file mode 100644 index 00000000..8e488bf5 --- /dev/null +++ b/language-web/src/main/js/language/props.ts | |||
@@ -0,0 +1,7 @@ | |||
1 | import { NodeProp } from '@lezer/common'; | ||
2 | |||
3 | export const implicitCompletion = new NodeProp({ | ||
4 | deserialize(s: string) { | ||
5 | return s === 'true'; | ||
6 | }, | ||
7 | }); | ||
diff --git a/language-web/src/main/js/xtext/ContentAssistService.ts b/language-web/src/main/js/xtext/ContentAssistService.ts index 65381b21..aa9a80b0 100644 --- a/language-web/src/main/js/xtext/ContentAssistService.ts +++ b/language-web/src/main/js/xtext/ContentAssistService.ts | |||
@@ -7,18 +7,11 @@ import { syntaxTree } from '@codemirror/language'; | |||
7 | import type { Transaction } from '@codemirror/state'; | 7 | import type { Transaction } from '@codemirror/state'; |
8 | import escapeStringRegexp from 'escape-string-regexp'; | 8 | import escapeStringRegexp from 'escape-string-regexp'; |
9 | 9 | ||
10 | import { implicitCompletion } from '../language/props'; | ||
10 | import type { UpdateService } from './UpdateService'; | 11 | import type { UpdateService } from './UpdateService'; |
11 | import { getLogger } from '../utils/logger'; | 12 | import { getLogger } from '../utils/logger'; |
12 | import type { IContentAssistEntry } from './xtextServiceResults'; | 13 | import type { IContentAssistEntry } from './xtextServiceResults'; |
13 | 14 | ||
14 | const IMPLICIT_COMPLETION_TOKENS = [ | ||
15 | 'QualifiedName', | ||
16 | 'true', | ||
17 | 'false', | ||
18 | 'unknown', | ||
19 | 'error', | ||
20 | ]; | ||
21 | |||
22 | const PROPOSALS_LIMIT = 1000; | 15 | const PROPOSALS_LIMIT = 1000; |
23 | 16 | ||
24 | const IDENTIFIER_REGEXP_STR = '[a-zA-Z0-9_]*'; | 17 | const IDENTIFIER_REGEXP_STR = '[a-zA-Z0-9_]*'; |
@@ -32,7 +25,7 @@ interface IFoundToken { | |||
32 | 25 | ||
33 | to: number; | 26 | to: number; |
34 | 27 | ||
35 | name: string; | 28 | implicitCompletion: boolean; |
36 | 29 | ||
37 | text: string; | 30 | text: string; |
38 | } | 31 | } |
@@ -50,14 +43,14 @@ function findToken({ pos, state }: CompletionContext): IFoundToken | null { | |||
50 | return { | 43 | return { |
51 | from: token.from, | 44 | from: token.from, |
52 | to: token.to, | 45 | to: token.to, |
53 | name: token.name, | 46 | implicitCompletion: token.type.prop(implicitCompletion) || false, |
54 | text: state.sliceDoc(token.from, token.to), | 47 | text: state.sliceDoc(token.from, token.to), |
55 | }; | 48 | }; |
56 | } | 49 | } |
57 | 50 | ||
58 | function shouldCompleteImplicitly(token: IFoundToken | null, context: CompletionContext): boolean { | 51 | function shouldCompleteImplicitly(token: IFoundToken | null, context: CompletionContext): boolean { |
59 | return token !== null | 52 | return token !== null |
60 | && IMPLICIT_COMPLETION_TOKENS.includes(token.name) | 53 | && token.implicitCompletion |
61 | && context.pos - token.from >= 2; | 54 | && context.pos - token.from >= 2; |
62 | } | 55 | } |
63 | 56 | ||