From 7363d83b6df50f6cd31f15aebe2ace95d13a2e00 Mon Sep 17 00:00:00 2001 From: Alex Tatiyants Date: Wed, 6 Jan 2016 21:33:50 -0800 Subject: improve syntax highlighting --- app/components/plan-node/plan-node.ts | 23 +++++++++++++++++------ 1 file changed, 17 insertions(+), 6 deletions(-) (limited to 'app/components/plan-node/plan-node.ts') diff --git a/app/components/plan-node/plan-node.ts b/app/components/plan-node/plan-node.ts index 87445fb..ce5f5db 100644 --- a/app/components/plan-node/plan-node.ts +++ b/app/components/plan-node/plan-node.ts @@ -74,27 +74,38 @@ export class PlanNode { } if (this.currentCompactView !== this.viewOptions.showCompactView) { - this.currentCompactView = this.viewOptions.showCompactView; - this.calculateBar(); + this.currentCompactView = this.viewOptions.showCompactView; + this.calculateBar(); } } getFormattedQuery() { var keyItems: Array = []; - var relationName = this.node[this._planService.RELATION_NAME_PROP]; + // relation name will be highlighted for SCAN nodes + var relationName: string = this.node[this._planService.RELATION_NAME_PROP]; if (relationName) { keyItems.push(this.node[this._planService.SCHEMA_PROP] + '.' + relationName); keyItems.push(' ' + relationName); keyItems.push(' ' + this.node[this._planService.ALIAS_PROP] + ' '); } + // group key will be highlighted for AGGREGATE nodes var groupKey: Array = this.node[this._planService.GROUP_KEY_PROP]; if (groupKey) { - keyItems.push('BY ' + groupKey.join(',')); - keyItems.push('BY ' + groupKey.join(', ')); + keyItems.push('GROUP BY ' + groupKey.join(',')); + } + + // hash condition will be highlighted for HASH JOIN nodes + var hashCondition: string = this.node[this._planService.HASH_CONDITION_PROP]; + if (hashCondition) { + keyItems.push(hashCondition.replace('(', '').replace(')', '')); + } + + if (this.node[this._planService.NODE_TYPE_PROP].toUpperCase() === 'LIMIT') { + keyItems.push('LIMIT'); } - return this._syntaxHighlightService.highlightKeyItems(this.plan.formattedQuery, keyItems); + return this._syntaxHighlightService.highlight(this.plan.query, keyItems); } calculateBar() { -- cgit v1.2.3