-
-
Notifications
You must be signed in to change notification settings - Fork 23
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
fix(auto-complete): suggest with as with.bind
- Loading branch information
Erik Lieben
authored
Dec 31, 2017
1 parent
ef771f8
commit ea625e1
Showing
2 changed files
with
972 additions
and
972 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,164 +1,164 @@ | ||
| import { autoinject } from 'aurelia-dependency-injection'; | ||
| import { CompletionItem, Position } from 'vscode-languageserver-types'; | ||
| import AttributeCompletionFactory from './Completions/AttributeCompletionFactory'; | ||
| import ElementCompletionFactory from './Completions/ElementCompletionFactory'; | ||
| import AttributeValueCompletionFactory from './Completions/AttributeValueCompletionFactory'; | ||
| import BindingCompletionFactory from './Completions/BindingCompletionFactory'; | ||
| import EmmetCompletionFactory from './Completions/EmmetCompletionFactory'; | ||
| import { DocumentParser, TagDefinition, AttributeDefinition } from './DocumentParser'; | ||
|
|
||
| @autoinject() | ||
| export default class CompletionItemFactory { | ||
|
|
||
| constructor( | ||
| private attributeCompletionFactory: AttributeCompletionFactory, | ||
| private elementCompletionFactory: ElementCompletionFactory, | ||
| private attributeValueCompletionFactory: AttributeValueCompletionFactory, | ||
| private bindingCompletionFactory: BindingCompletionFactory, | ||
| private emmetCompletionFactory: EmmetCompletionFactory, | ||
| private parser: DocumentParser) { } | ||
|
|
||
| public async create( | ||
| triggerCharacter: string, | ||
| position: Position, | ||
| text: string, | ||
| positionNumber: number, | ||
| uri: string): Promise<Array<CompletionItem>> { | ||
|
|
||
| let nodes = await this.parser.parse(text); | ||
| let insideTag: TagDefinition = null; | ||
| let lastIdx = 0; | ||
|
|
||
| // get insidetag and last index of tag | ||
| for(let i = 0; i < nodes.length; i++) { | ||
| let node = nodes[i]; | ||
| if (!insideTag && positionNumber >= node.startOffset && positionNumber <= node.endOffset) { | ||
| insideTag = node; | ||
| } | ||
| if (node !== insideTag && node.endOffset > positionNumber) { | ||
| lastIdx = i; | ||
| break; | ||
| } | ||
| } | ||
|
|
||
| // get open parent tag | ||
| let tags = this.getOpenHtmlTags(nodes, lastIdx); | ||
| let parentTag = tags[tags.length - 1]; | ||
|
|
||
| // auto complete inside a tag | ||
| if (insideTag) { | ||
|
|
||
| let elementString = text.substring(insideTag.startOffset, positionNumber); | ||
| if (this.notInAttributeValue(elementString)) { | ||
|
|
||
| if (triggerCharacter === ' ') { | ||
| return this.attributeCompletionFactory.create(insideTag.name, insideTag.attributes.map(i => i.name)); | ||
| } else if (triggerCharacter === '.' && this.canExpandDot(elementString)) { | ||
| return this.createBindingCompletion(insideTag, text, positionNumber); | ||
| } else { | ||
| return []; | ||
| } | ||
|
|
||
| // inside attribute, perform attribute completion | ||
| } else if (triggerCharacter === '"' || triggerCharacter === '\'') { | ||
| return this.createValueCompletion(insideTag, text, positionNumber); | ||
| } else { | ||
| return []; | ||
| } | ||
| } | ||
|
|
||
| // auto complete others | ||
| switch (triggerCharacter) { | ||
| case '[': | ||
| return this.createEmmetCompletion(text, positionNumber); | ||
| case '<': | ||
| return this.elementCompletionFactory.create(parentTag); | ||
| } | ||
| } | ||
|
|
||
| private notInAttributeValue(tagText: string) { | ||
| let single = 0, double = 0; | ||
| for(let char of tagText) { | ||
| if (char === '"') double += 1; | ||
| if (char === '\'') single += 1; | ||
| } | ||
| return single % 2 == 0 && double % 2 == 0; | ||
| } | ||
|
|
||
| private canExpandDot(elementString) { | ||
| return !/([^a-zA-Z]|\.(bind|one-way|two-way|one-time|delegate|trigger|call|capture|ref))\.$/g.test(elementString); | ||
| } | ||
|
|
||
| private getOpenHtmlTags(nodes: Array<TagDefinition>, lastIdx: number) { | ||
| let tags: Array<string> = []; | ||
| for(let i = 0; i < lastIdx; i++) { | ||
| if (nodes[i].startTag) { | ||
| tags.push(nodes[i].name); | ||
| } else { | ||
| var index = tags.indexOf(nodes[i].name); | ||
| if (index >= 0) { | ||
| tags.splice( index, 1 ); | ||
| } | ||
| } | ||
| } | ||
| return tags; | ||
| } | ||
|
|
||
| private createValueCompletion(tag: TagDefinition, text: string, position: number) { | ||
| let nextCharacter = text.substring(position, position + 1); | ||
| if (/['"]/.test(nextCharacter)) { | ||
| let attribute; | ||
| let elementText = text.substring(tag.startOffset, tag.endOffset); | ||
| let tagPosition = position - tag.startOffset; | ||
| const attributeRegex = /([\w-]+)\.?\w*\=['"]/g; | ||
| let matches; | ||
| while (matches = attributeRegex.exec(elementText)) { | ||
| if (tagPosition >= matches.index && (tagPosition <= matches.index + matches[0].length)) { | ||
| let foundText = matches[1]; | ||
| let attributes = tag.attributes.filter(a => a && a.name == foundText); | ||
| if (attributes.length) { | ||
| attribute = attributes[0]; | ||
| break; | ||
| } | ||
| } | ||
| } | ||
| if (!attribute) { | ||
| return []; | ||
| } | ||
| return this.attributeValueCompletionFactory.create(tag.name, attribute.name, attribute.binding); | ||
| } | ||
| } | ||
|
|
||
| private createEmmetCompletion(text: string, position: number) { | ||
| const emmetRegex = /^([^<]*?>)*?([\w|-]*)\[$/gm; | ||
| let matches = emmetRegex.exec(text.substring(0, position)); | ||
| if (!matches) { | ||
| return []; | ||
| } | ||
| let elementName = matches[2]; | ||
| return this.emmetCompletionFactory.create(elementName); | ||
| } | ||
|
|
||
| private createBindingCompletion(tag: TagDefinition, text: string, position: number) { | ||
| let attribute; | ||
| let elementText = text.substring(tag.startOffset, tag.endOffset); | ||
| let tagPosition = position - tag.startOffset; | ||
| const attributeRegex = /([\w\.-]+)(\=['"](.*?)["'])?/g; | ||
| let matches; | ||
| let foundText = ''; | ||
| while (matches = attributeRegex.exec(elementText)) { | ||
| if (tagPosition >= matches.index && (tagPosition <= matches.index + matches[1].length)) { | ||
| foundText = matches[1]; | ||
| let attributes = tag.attributes.filter(a => a.name + (a.binding !== undefined ? '.' : '') == foundText); | ||
| if (attributes.length) { | ||
| attribute = attributes[0]; | ||
| break; | ||
| } | ||
| } | ||
| } | ||
| if (!attribute) { | ||
| attribute = new AttributeDefinition(foundText.substring(0, foundText.length-1), ''); | ||
| } | ||
| return this.bindingCompletionFactory.create(tag, attribute, text.substring(position, position + 1)); | ||
| } | ||
| } | ||
| import { autoinject } from 'aurelia-dependency-injection'; | ||
| import { CompletionItem, Position } from 'vscode-languageserver-types'; | ||
| import AttributeCompletionFactory from './Completions/AttributeCompletionFactory'; | ||
| import ElementCompletionFactory from './Completions/ElementCompletionFactory'; | ||
| import AttributeValueCompletionFactory from './Completions/AttributeValueCompletionFactory'; | ||
| import BindingCompletionFactory from './Completions/BindingCompletionFactory'; | ||
| import EmmetCompletionFactory from './Completions/EmmetCompletionFactory'; | ||
| import { DocumentParser, TagDefinition, AttributeDefinition } from './DocumentParser'; | ||
|
|
||
| @autoinject() | ||
| export default class CompletionItemFactory { | ||
|
|
||
| constructor( | ||
| private attributeCompletionFactory: AttributeCompletionFactory, | ||
| private elementCompletionFactory: ElementCompletionFactory, | ||
| private attributeValueCompletionFactory: AttributeValueCompletionFactory, | ||
| private bindingCompletionFactory: BindingCompletionFactory, | ||
| private emmetCompletionFactory: EmmetCompletionFactory, | ||
| private parser: DocumentParser) { } | ||
|
|
||
| public async create( | ||
| triggerCharacter: string, | ||
| position: Position, | ||
| text: string, | ||
| positionNumber: number, | ||
| uri: string): Promise<Array<CompletionItem>> { | ||
|
|
||
| let nodes = await this.parser.parse(text); | ||
| let insideTag: TagDefinition = null; | ||
| let lastIdx = 0; | ||
|
|
||
| // get insidetag and last index of tag | ||
| for(let i = 0; i < nodes.length; i++) { | ||
| let node = nodes[i]; | ||
| if (!insideTag && positionNumber >= node.startOffset && positionNumber <= node.endOffset) { | ||
| insideTag = node; | ||
| } | ||
| if (node !== insideTag && node.endOffset > positionNumber) { | ||
| lastIdx = i; | ||
| break; | ||
| } | ||
| } | ||
|
|
||
| // get open parent tag | ||
| let tags = this.getOpenHtmlTags(nodes, lastIdx); | ||
| let parentTag = tags[tags.length - 1]; | ||
|
|
||
| // auto complete inside a tag | ||
| if (insideTag) { | ||
|
|
||
| let elementString = text.substring(insideTag.startOffset, positionNumber); | ||
| if (this.notInAttributeValue(elementString)) { | ||
|
|
||
| if (triggerCharacter === ' ') { | ||
| return this.attributeCompletionFactory.create(insideTag.name, insideTag.attributes.map(i => i.name)); | ||
| } else if (triggerCharacter === '.' && this.canExpandDot(elementString)) { | ||
| return this.createBindingCompletion(insideTag, text, positionNumber); | ||
| } else { | ||
| return []; | ||
| } | ||
|
|
||
| // inside attribute, perform attribute completion | ||
| } else if (triggerCharacter === '"' || triggerCharacter === '\'') { | ||
| return this.createValueCompletion(insideTag, text, positionNumber); | ||
| } else { | ||
| return []; | ||
| } | ||
| } | ||
|
|
||
| // auto complete others | ||
| switch (triggerCharacter) { | ||
| case '[': | ||
| return this.createEmmetCompletion(text, positionNumber); | ||
| case '<': | ||
| return this.elementCompletionFactory.create(parentTag); | ||
| } | ||
| } | ||
|
|
||
| private notInAttributeValue(tagText: string) { | ||
| let single = 0, double = 0; | ||
| for(let char of tagText) { | ||
| if (char === '"') double += 1; | ||
| if (char === '\'') single += 1; | ||
| } | ||
| return single % 2 == 0 && double % 2 == 0; | ||
| } | ||
|
|
||
| private canExpandDot(elementString) { | ||
| return !/([^a-zA-Z]|\.(bind|one-way|two-way|one-time|from-view|to-view|delegate|trigger|call|capture|ref))\.$/g.test(elementString); | ||
| } | ||
|
|
||
| private getOpenHtmlTags(nodes: Array<TagDefinition>, lastIdx: number) { | ||
| let tags: Array<string> = []; | ||
| for(let i = 0; i < lastIdx; i++) { | ||
| if (nodes[i].startTag) { | ||
| tags.push(nodes[i].name); | ||
| } else { | ||
| var index = tags.indexOf(nodes[i].name); | ||
| if (index >= 0) { | ||
| tags.splice( index, 1 ); | ||
| } | ||
| } | ||
| } | ||
| return tags; | ||
| } | ||
|
|
||
| private createValueCompletion(tag: TagDefinition, text: string, position: number) { | ||
| let nextCharacter = text.substring(position, position + 1); | ||
| if (/['"]/.test(nextCharacter)) { | ||
| let attribute; | ||
| let elementText = text.substring(tag.startOffset, tag.endOffset); | ||
| let tagPosition = position - tag.startOffset; | ||
| const attributeRegex = /([\w-]+)\.?\w*\=['"]/g; | ||
| let matches; | ||
| while (matches = attributeRegex.exec(elementText)) { | ||
| if (tagPosition >= matches.index && (tagPosition <= matches.index + matches[0].length)) { | ||
| let foundText = matches[1]; | ||
| let attributes = tag.attributes.filter(a => a && a.name == foundText); | ||
| if (attributes.length) { | ||
| attribute = attributes[0]; | ||
| break; | ||
| } | ||
| } | ||
| } | ||
| if (!attribute) { | ||
| return []; | ||
| } | ||
| return this.attributeValueCompletionFactory.create(tag.name, attribute.name, attribute.binding); | ||
| } | ||
| } | ||
|
|
||
| private createEmmetCompletion(text: string, position: number) { | ||
| const emmetRegex = /^([^<]*?>)*?([\w|-]*)\[$/gm; | ||
| let matches = emmetRegex.exec(text.substring(0, position)); | ||
| if (!matches) { | ||
| return []; | ||
| } | ||
| let elementName = matches[2]; | ||
| return this.emmetCompletionFactory.create(elementName); | ||
| } | ||
|
|
||
| private createBindingCompletion(tag: TagDefinition, text: string, position: number) { | ||
| let attribute; | ||
| let elementText = text.substring(tag.startOffset, tag.endOffset); | ||
| let tagPosition = position - tag.startOffset; | ||
| const attributeRegex = /([\w\.-]+)(\=['"](.*?)["'])?/g; | ||
| let matches; | ||
| let foundText = ''; | ||
| while (matches = attributeRegex.exec(elementText)) { | ||
| if (tagPosition >= matches.index && (tagPosition <= matches.index + matches[1].length)) { | ||
| foundText = matches[1]; | ||
| let attributes = tag.attributes.filter(a => a.name + (a.binding !== undefined ? '.' : '') == foundText); | ||
| if (attributes.length) { | ||
| attribute = attributes[0]; | ||
| break; | ||
| } | ||
| } | ||
| } | ||
| if (!attribute) { | ||
| attribute = new AttributeDefinition(foundText.substring(0, foundText.length-1), ''); | ||
| } | ||
| return this.bindingCompletionFactory.create(tag, attribute, text.substring(position, position + 1)); | ||
| } | ||
| } |
Oops, something went wrong.