From 9f5e511dde566654b9f28d177f6021ba1a722dfb Mon Sep 17 00:00:00 2001 From: Michael Schmidt Date: Mon, 22 Nov 2021 12:59:56 +0100 Subject: [PATCH] Applescript: Use `class-name` standard token (#3182) --- components/prism-applescript.js | 5 +- components/prism-applescript.min.js | 2 +- .../applescript/class-name_feature.test | 90 +++++++++++++++++++ .../languages/applescript/class_feature.test | 39 -------- 4 files changed, 92 insertions(+), 44 deletions(-) create mode 100644 tests/languages/applescript/class-name_feature.test delete mode 100644 tests/languages/applescript/class_feature.test diff --git a/components/prism-applescript.js b/components/prism-applescript.js index 5a8f338d71..3d688b4a8d 100644 --- a/components/prism-applescript.js +++ b/components/prism-applescript.js @@ -12,9 +12,6 @@ Prism.languages.applescript = { /\b(?:(?:begin|end|start)s? with|(?:contains?|(?:does not|doesn't) contain)|(?:is|isn't|is not) (?:contained by|in)|(?:(?:is|isn't|is not) )?(?:greater|less) than(?: or equal)?(?: to)?|(?:comes|(?:does not|doesn't) come) (?:after|before)|(?:is|isn't|is not) equal(?: to)?|(?:(?:does not|doesn't) equal|equal to|equals|is not|isn't)|(?:a )?(?:ref(?: to)?|reference to)|(?:and|as|div|mod|not|or))\b/ ], 'keyword': /\b(?:about|above|after|against|apart from|around|aside from|at|back|before|beginning|behind|below|beneath|beside|between|but|by|considering|continue|copy|does|eighth|else|end|equal|error|every|exit|false|fifth|first|for|fourth|from|front|get|given|global|if|ignoring|in|instead of|into|is|it|its|last|local|me|middle|my|ninth|of|on|onto|out of|over|prop|property|put|repeat|return|returning|second|set|seventh|since|sixth|some|tell|tenth|that|the|then|third|through|thru|timeout|times|to|transaction|true|try|until|where|while|whose|with|without)\b/, - 'class': { - pattern: /\b(?:POSIX file|RGB color|alias|application|boolean|centimeters|centimetres|class|constant|cubic centimeters|cubic centimetres|cubic feet|cubic inches|cubic meters|cubic metres|cubic yards|date|degrees Celsius|degrees Fahrenheit|degrees Kelvin|feet|file|gallons|grams|inches|integer|kilograms|kilometers|kilometres|list|liters|litres|meters|metres|miles|number|ounces|pounds|quarts|real|record|reference|script|square feet|square kilometers|square kilometres|square meters|square metres|square miles|square yards|text|yards)\b/, - alias: 'builtin' - }, + 'class-name': /\b(?:POSIX file|RGB color|alias|application|boolean|centimeters|centimetres|class|constant|cubic centimeters|cubic centimetres|cubic feet|cubic inches|cubic meters|cubic metres|cubic yards|date|degrees Celsius|degrees Fahrenheit|degrees Kelvin|feet|file|gallons|grams|inches|integer|kilograms|kilometers|kilometres|list|liters|litres|meters|metres|miles|number|ounces|pounds|quarts|real|record|reference|script|square feet|square kilometers|square kilometres|square meters|square metres|square miles|square yards|text|yards)\b/, 'punctuation': /[{}():,¬«»《》]/ }; diff --git a/components/prism-applescript.min.js b/components/prism-applescript.min.js index ee7fa91953..57635ecf26 100644 --- a/components/prism-applescript.min.js +++ b/components/prism-applescript.min.js @@ -1 +1 @@ -Prism.languages.applescript={comment:[/\(\*(?:\(\*(?:[^*]|\*(?!\)))*\*\)|(?!\(\*)[\s\S])*?\*\)/,/--.+/,/#.+/],string:/"(?:\\.|[^"\\\r\n])*"/,number:/(?:\b\d+(?:\.\d*)?|\B\.\d+)(?:e-?\d+)?\b/i,operator:[/[&=≠≤≥*+\-\/÷^]|[<>]=?/,/\b(?:(?:begin|end|start)s? with|(?:contains?|(?:does not|doesn't) contain)|(?:is|isn't|is not) (?:contained by|in)|(?:(?:is|isn't|is not) )?(?:greater|less) than(?: or equal)?(?: to)?|(?:comes|(?:does not|doesn't) come) (?:after|before)|(?:is|isn't|is not) equal(?: to)?|(?:(?:does not|doesn't) equal|equal to|equals|is not|isn't)|(?:a )?(?:ref(?: to)?|reference to)|(?:and|as|div|mod|not|or))\b/],keyword:/\b(?:about|above|after|against|apart from|around|aside from|at|back|before|beginning|behind|below|beneath|beside|between|but|by|considering|continue|copy|does|eighth|else|end|equal|error|every|exit|false|fifth|first|for|fourth|from|front|get|given|global|if|ignoring|in|instead of|into|is|it|its|last|local|me|middle|my|ninth|of|on|onto|out of|over|prop|property|put|repeat|return|returning|second|set|seventh|since|sixth|some|tell|tenth|that|the|then|third|through|thru|timeout|times|to|transaction|true|try|until|where|while|whose|with|without)\b/,class:{pattern:/\b(?:POSIX file|RGB color|alias|application|boolean|centimeters|centimetres|class|constant|cubic centimeters|cubic centimetres|cubic feet|cubic inches|cubic meters|cubic metres|cubic yards|date|degrees Celsius|degrees Fahrenheit|degrees Kelvin|feet|file|gallons|grams|inches|integer|kilograms|kilometers|kilometres|list|liters|litres|meters|metres|miles|number|ounces|pounds|quarts|real|record|reference|script|square feet|square kilometers|square kilometres|square meters|square metres|square miles|square yards|text|yards)\b/,alias:"builtin"},punctuation:/[{}():,¬«»《》]/}; \ No newline at end of file +Prism.languages.applescript={comment:[/\(\*(?:\(\*(?:[^*]|\*(?!\)))*\*\)|(?!\(\*)[\s\S])*?\*\)/,/--.+/,/#.+/],string:/"(?:\\.|[^"\\\r\n])*"/,number:/(?:\b\d+(?:\.\d*)?|\B\.\d+)(?:e-?\d+)?\b/i,operator:[/[&=≠≤≥*+\-\/÷^]|[<>]=?/,/\b(?:(?:begin|end|start)s? with|(?:contains?|(?:does not|doesn't) contain)|(?:is|isn't|is not) (?:contained by|in)|(?:(?:is|isn't|is not) )?(?:greater|less) than(?: or equal)?(?: to)?|(?:comes|(?:does not|doesn't) come) (?:after|before)|(?:is|isn't|is not) equal(?: to)?|(?:(?:does not|doesn't) equal|equal to|equals|is not|isn't)|(?:a )?(?:ref(?: to)?|reference to)|(?:and|as|div|mod|not|or))\b/],keyword:/\b(?:about|above|after|against|apart from|around|aside from|at|back|before|beginning|behind|below|beneath|beside|between|but|by|considering|continue|copy|does|eighth|else|end|equal|error|every|exit|false|fifth|first|for|fourth|from|front|get|given|global|if|ignoring|in|instead of|into|is|it|its|last|local|me|middle|my|ninth|of|on|onto|out of|over|prop|property|put|repeat|return|returning|second|set|seventh|since|sixth|some|tell|tenth|that|the|then|third|through|thru|timeout|times|to|transaction|true|try|until|where|while|whose|with|without)\b/,"class-name":/\b(?:POSIX file|RGB color|alias|application|boolean|centimeters|centimetres|class|constant|cubic centimeters|cubic centimetres|cubic feet|cubic inches|cubic meters|cubic metres|cubic yards|date|degrees Celsius|degrees Fahrenheit|degrees Kelvin|feet|file|gallons|grams|inches|integer|kilograms|kilometers|kilometres|list|liters|litres|meters|metres|miles|number|ounces|pounds|quarts|real|record|reference|script|square feet|square kilometers|square kilometres|square meters|square metres|square miles|square yards|text|yards)\b/,punctuation:/[{}():,¬«»《》]/}; \ No newline at end of file diff --git a/tests/languages/applescript/class-name_feature.test b/tests/languages/applescript/class-name_feature.test new file mode 100644 index 0000000000..db348ead10 --- /dev/null +++ b/tests/languages/applescript/class-name_feature.test @@ -0,0 +1,90 @@ +alias application boolean class constant +date file integer list number +POSIX file +real record reference +RGB color +script text centimetres centimeters feet +inches kilometres kilometers metres meters +miles yards +square feet square kilometres square kilometers square metres +square meters square miles square yards +cubic centimetres cubic centimeters cubic feet cubic inches +cubic metres cubic meters cubic yards +gallons litres liters quarts grams +kilograms ounces pounds +degrees Celsius degrees Fahrenheit degrees Kelvin + +---------------------------------------------------- + +[ + ["class-name", "alias"], + ["class-name", "application"], + ["class-name", "boolean"], + ["class-name", "class"], + ["class-name", "constant"], + + ["class-name", "date"], + ["class-name", "file"], + ["class-name", "integer"], + ["class-name", "list"], + ["class-name", "number"], + + ["class-name", "POSIX file"], + + ["class-name", "real"], + ["class-name", "record"], + ["class-name", "reference"], + + ["class-name", "RGB color"], + + ["class-name", "script"], + ["class-name", "text"], + ["class-name", "centimetres"], + ["class-name", "centimeters"], + ["class-name", "feet"], + + ["class-name", "inches"], + ["class-name", "kilometres"], + ["class-name", "kilometers"], + ["class-name", "metres"], + ["class-name", "meters"], + + ["class-name", "miles"], + ["class-name", "yards"], + + ["class-name", "square feet"], + ["class-name", "square kilometres"], + ["class-name", "square kilometers"], + ["class-name", "square metres"], + + ["class-name", "square meters"], + ["class-name", "square miles"], + ["class-name", "square yards"], + + ["class-name", "cubic centimetres"], + ["class-name", "cubic centimeters"], + ["class-name", "cubic feet"], + ["class-name", "cubic inches"], + + ["class-name", "cubic metres"], + ["class-name", "cubic meters"], + ["class-name", "cubic yards"], + + ["class-name", "gallons"], + ["class-name", "litres"], + ["class-name", "liters"], + ["class-name", "quarts"], + ["class-name", "grams"], + + ["class-name", "kilograms"], + ["class-name", "ounces"], + ["class-name", "pounds"], + + ["class-name", "degrees Celsius"], + ["class-name", "degrees Fahrenheit"], + ["class-name", "degrees Kelvin"] +] + +---------------------------------------------------- + +Checks for all classes. diff --git a/tests/languages/applescript/class_feature.test b/tests/languages/applescript/class_feature.test deleted file mode 100644 index 547906deab..0000000000 --- a/tests/languages/applescript/class_feature.test +++ /dev/null @@ -1,39 +0,0 @@ -alias application boolean class constant -date file integer list number -POSIX file -real record reference -RGB color -script text centimetres centimeters feet -inches kilometres kilometers metres meters -miles yards -square feet square kilometres square kilometers square metres -square meters square miles square yards -cubic centimetres cubic centimeters cubic feet cubic inches -cubic metres cubic meters cubic yards -gallons litres liters quarts grams -kilograms ounces pounds -degrees Celsius degrees Fahrenheit degrees Kelvin - ----------------------------------------------------- - -[ - ["class", "alias"], ["class", "application"], ["class", "boolean"], ["class", "class"], ["class", "constant"], - ["class", "date"], ["class", "file"], ["class", "integer"], ["class", "list"], ["class", "number"], - ["class", "POSIX file"], - ["class", "real"], ["class", "record"], ["class", "reference"], - ["class", "RGB color"], - ["class", "script"], ["class", "text"], ["class", "centimetres"], ["class", "centimeters"], ["class", "feet"], - ["class", "inches"], ["class", "kilometres"], ["class", "kilometers"], ["class", "metres"], ["class", "meters"], - ["class", "miles"], ["class", "yards"], - ["class", "square feet"], ["class", "square kilometres"], ["class", "square kilometers"], ["class", "square metres"], - ["class", "square meters"], ["class", "square miles"], ["class", "square yards"], - ["class", "cubic centimetres"], ["class", "cubic centimeters"], ["class", "cubic feet"], ["class", "cubic inches"], - ["class", "cubic metres"], ["class", "cubic meters"], ["class", "cubic yards"], - ["class", "gallons"], ["class", "litres"], ["class", "liters"], ["class", "quarts"], ["class", "grams"], - ["class", "kilograms"], ["class", "ounces"], ["class", "pounds"], - ["class", "degrees Celsius"], ["class", "degrees Fahrenheit"], ["class", "degrees Kelvin"] -] - ----------------------------------------------------- - -Checks for all classes. \ No newline at end of file