Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Dax: Update list of Functions #2345

Merged
merged 12 commits into from
Feb 16, 2023
Merged

Dax: Update list of Functions #2345

Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
172419b
Lexer for Power BI DAX
GD-L Feb 2, 2023
bdf4fca
Add new lexer for DAX
GD-L Feb 2, 2023
8e86ef7
Correction to mapping alias for DAX
GD-L Feb 2, 2023
30a68e0
Apply suggestions from code review
GD-L Feb 2, 2023
530eefa
Edits to PR #2334
GD-L Feb 3, 2023
4462039
Edits to PR #2335
GD-L Feb 3, 2023
158cb1e
Merge branch 'master' of github.com:GD-L/pygments
GD-L Feb 3, 2023
a2dc175
Add docstring + style fixes
jeanas Feb 12, 2023
315c002
Removed text capture
GD-L Feb 13, 2023
841b1a5
Appease regexlint
jeanas Feb 13, 2023
65c257c
Updated list of Function Words
GD-L Feb 16, 2023
7543c51
Merge branch 'master' of github.com:GD-L/pygments
GD-L Feb 16, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
115 changes: 68 additions & 47 deletions pygments/lexers/dax.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,53 +32,74 @@ class DaxLexer(RegexLexer):
(r"--.*\n?", Comment.Single), # Comment: Double dash comment
(r"//.*\n?", Comment.Single), # Comment: Double backslash comment
(r'/\*', Comment.Multiline, 'multiline-comments'),
(words(('abs','acos','acosh','acot','acoth','addcolumns','addmissingitems','all',
'allcrossfiltered','allexcept','allnoblankrow','allselected','and',
'approximatedistinctcount','asin','asinh','atan','atanh','average',
'averagea','averagex','beta.dist','beta.inv','blank','calculate',
'calculatetable','calendar','calendarauto','ceiling','chisq.dist',
'chisq.dist.rt','chisq.inv','chisq.inv.rt','closingbalancemonth',
'closingbalancequarter','closingbalanceyear','coalesce','combin',
'combina','combinevalues','concatenate','concatenatex','confidence.norm',
'confidence.t','contains','containsrow','containsstring','containsstringexact',
'convert','cos','cosh','cot','coth','count','counta','countax','countblank',
'countrows','countx','crossfilter','crossjoin','currency','currentgroup',
'customdata','datatable','date','dateadd','datediff','datesbetween',
'datesinperiod','datesmtd','datesqtd','datesytd','datevalue','day','degrees',
'detailrows','distinct','distinctcount','distinctcountnoblank','divide',
'earlier','earliest','edate','endofmonth','endofquarter','endofyear',
'eomonth','error','even','exact','except','exp','expon.dist','fact',
'false','filter','filters','find','firstdate','firstnonblank','firstnonblankvalue',
'fixed','floor','format','gcd','generate','generateall','generateseries','geomean',
'geomeanx','groupby','hasonefilter','hasonevalue','hour','if','if.eager','iferror',
'ignore','int','intersect','isblank','iscrossfiltered','isempty','iserror','iseven',
'isfiltered','isinscope','islogical','isnontext','isnumber','iso.ceiling','isodd',
'isonorafter','isselectedmeasure','issubtotal','istext','keepfilters',
'keywordmatch','lastdate','lastnonblank','lastnonblankvalue','lcm','left',
'len','ln','log','log10','lookupvalue','lower','max','maxa','maxx',
'median','medianx','mid','min','mina','minute','minx','mod','month',
'mround','naturalinnerjoin','naturalleftouterjoin',
'nextday','nextmonth','nextquarter','nextyear','nonvisual','norm.dist','norm.inv',
'norm.s.dist','norm.s.inv','not','now','odd','openingbalancemonth',
'openingbalancequarter','openingbalanceyear','or','parallelperiod',
'path','pathcontains','pathitem','pathitemreverse','pathlength','percentile.exc',
'percentile.inc','percentilex.exc','percentilex.inc','permut','pi',
'poisson.dist','power','previousday','previousmonth','previousquarter',
'previousyear','product','productx','quarter','quotient','radians',
'rand','randbetween','rank.eq','rankx','related','relatedtable','removefilters',
'replace','rept','right','rollup','rollupaddissubtotal','rollupgroup',
'rollupissubtotal','round','rounddown','roundup','row','sameperiodlastyear',
'sample','search','second','selectcolumns','selectedmeasure',
'selectedmeasureformatstring','selectedmeasurename','selectedvalue',
'sign','sin','sinh','sqrt','sqrtpi','startofmonth','startofquarter',
'startofyear','stdev.p','stdev.s''stdevx.p','stdevx.s','substitute',
'substitutewithindex','sum','summarize','summarizecolumns','sumx',
'switch','t.dist','t.dist.2t','t.dist.rt','t.inv','t.inv.2t','tan',
'tanh','time','timevalue','today','topn','topnskip','totalmtd',
'totalqtd','totalytd','treatas','trim','true','trunc','unichar','unicode',
'union','upper','userelationship','username','userobjectid','userprincipalname',
'utcnow','utctoday','value','values','var.p','var.s','varx.p','varx.s',
'weekday','weeknum','xirr','xnpv','year','yearfrac'),
(words(('abs', 'accrint', 'accrintm', 'acos', 'acosh', 'acot', 'acoth',
'addcolumns', 'addmissingitems', 'all', 'allcrossfiltered',
'allexcept', 'allnoblankrow', 'allselected', 'amordegrc', 'amorlinc',
'and','approximatedistinctcount', 'asin', 'asinh', 'atan', 'atanh',
'average', 'averagea', 'averagex', 'beta.dist', 'beta.inv',
'bitand', 'bitlshift', 'bitor', 'bitrshift', 'bitxor', 'blank',
'calculate', 'calculatetable', 'calendar', 'calendarauto', 'ceiling',
'chisq.dist', 'chisq.dist.rt', 'chisq.inv', 'chisq.inv.rt',
'closingbalancemonth', 'closingbalancequarter', 'closingbalanceyear',
'coalesce', 'columnstatistics', 'combin', 'combina', 'combinevalues',
'concatenate', 'concatenatex', 'confidence.norm', 'confidence.t',
'contains', 'containsrow', 'containsstring', 'containsstringexact',
'convert', 'cos', 'cosh', 'cot', 'coth', 'count', 'counta', 'countax',
'countblank', 'countrows', 'countx', 'coupdaybs', 'coupdays',
'coupdaysnc', 'coupncd', 'coupnum', 'couppcd', 'crossfilter',
'crossjoin', 'cumipmt', 'cumprinc', 'currency', 'currentgroup',
'customdata', 'datatable', 'date', 'dateadd', 'datediff',
'datesbetween', 'datesinperiod', 'datesmtd', 'datesqtd',
'datesytd', 'datevalue', 'day', 'db', 'ddb', 'degrees', 'detailrows',
'disc', 'distinct', 'distinctcount', 'distinctcountnoblank',
'divide', 'dollarde', 'dollarfr', 'duration', 'earlier', 'earliest',
'edate', 'effect', 'endofmonth', 'endofquarter', 'endofyear',
'eomonth', 'error', 'evaluateandlog', 'even', 'exact', 'except',
'exp', 'expon.dist', 'fact', 'false', 'filter', 'filters', 'find',
'firstdate', 'firstnonblank', 'firstnonblankvalue', 'fixed', 'floor',
'format', 'fv', 'gcd', 'generate', 'generateall', 'generateseries',
'geomean', 'geomeanx', 'groupby', 'hash', 'hasonefilter',
'hasonevalue', 'hour', 'if', 'if.eager', 'iferror', 'ignore', 'index',
'int', 'intersect', 'intrate', 'ipmt', 'isafter', 'isblank',
'iscrossfiltered', 'isempty', 'iserror', 'iseven', 'isfiltered',
'isinscope', 'islogical', 'isnontext', 'isnumber', 'iso.ceiling',
'isodd', 'isonorafter', 'ispmt', 'isselectedmeasure', 'issubtotal',
'istext', 'keepfilters', 'keywordmatch', 'lastdate', 'lastnonblank',
'lastnonblankvalue', 'lcm', 'left', 'len', 'linest', 'linestx', 'ln',
'log', 'log10', 'lookupvalue', 'lower', 'max', 'maxa', 'maxx',
'mduration', 'median', 'medianx', 'mid', 'min', 'mina', 'minute',
'minx', 'mod', 'month', 'mround', 'nameof', 'naturalinnerjoin',
'naturalleftouterjoin', 'networkdays', 'nextday', 'nextmonth',
'nextquarter', 'nextyear', 'nominal', 'nonvisual', 'norm.dist',
'norm.inv', 'norm.s.dist', 'norm.s.inv', 'not', 'now', 'nper', 'odd',
'oddfprice', 'oddfyield', 'oddlprice', 'oddlyield', 'offset',
'openingbalancemonth', 'openingbalancequarter', 'openingbalanceyear',
'or', 'orderby', 'parallelperiod', 'partitionby', 'path',
'pathcontains', 'pathitem', 'pathitemreverse', 'pathlength',
'pduration', 'percentile.exc', 'percentile.inc', 'percentilex.exc',
'percentilex.inc', 'permut', 'pi', 'pmt', 'poisson.dist', 'power',
'ppmt', 'previousday', 'previousmonth', 'previousquarter',
'previousyear', 'price', 'pricedisc', 'pricemat', 'product',
'productx', 'pv', 'quarter', 'quotient', 'radians', 'rand',
'randbetween', 'rank.eq', 'rankx', 'rate', 'received', 'related',
'relatedtable', 'removefilters', 'replace', 'rept', 'right',
'rollup', 'rollupaddissubtotal', 'rollupgroup', 'rollupissubtotal',
'round', 'rounddown', 'roundup', 'row', 'rri', 'sameperiodlastyear',
'sample', 'sampleaxiswithlocalminmax', 'search', 'second',
'selectcolumns', 'selectedmeasure', 'selectedmeasureformatstring',
'selectedmeasurename', 'selectedvalue', 'sign', 'sin', 'sinh', 'sln',
'sqrt', 'sqrtpi', 'startofmonth', 'startofquarter', 'startofyear',
'stdev.p', 'stdev.s', 'stdevx.p', 'stdevx.s', 'substitute',
'substitutewithindex', 'sum', 'summarize', 'summarizecolumns', 'sumx',
'switch', 'syd', 't.dist', 't.dist.2t', 't.dist.rt', 't.inv',
't.inv.2t', 'tan', 'tanh', 'tbilleq', 'tbillprice', 'tbillyield',
'time', 'timevalue', 'tocsv', 'today', 'tojson', 'topn',
'topnperlevel', 'topnskip', 'totalmtd', 'totalqtd', 'totalytd',
'treatas', 'trim', 'true', 'trunc', 'unichar', 'unicode', 'union',
'upper', 'userculture', 'userelationship', 'username', 'userobjectid',
'userprincipalname', 'utcnow', 'utctoday', 'value', 'values', 'var.p',
'var.s', 'varx.p', 'varx.s', 'vdb', 'weekday', 'weeknum', 'window',
'xirr', 'xnpv', 'year', 'yearfrac', 'yield', 'yielddisc', 'yieldmat'),
prefix=r'(?i)', suffix=r'\b'), Name.Function), #Functions

(words(('at','asc','boolean','both','by','create','currency',
Expand Down