Update sqf.js to match latest changes in Arma 3 v2.11 #3686

Leopard20 · 2023-01-07T16:47:23Z

Changes

Added new commands
Removed invalid commands
Removed # as an illegal character (legal as of Arma 3 v1.82)

This is a follow up to #3193. It was quite outdated so I opened a new one. It also applies the requested changes to make it not fail the detection asserts.

P.S: I think GitHub's diff is broken because it shows the entire file has changed. It looks correct in VSCode though.

src/languages/sqf.js

joshgoebel · 2023-01-07T17:48:45Z

src/languages/sqf.js

+    className: 'meta',
+    begin: /#\s*[a-z]+\b/,
+    end: /$/,
+    keywords: {


Technically this could collapse to just keywords a nested hash isn't necessary if one isn't specified keyword is the default scope used.

joshgoebel · 2023-01-07T17:50:32Z

src/languages/sqf.js

+  // https://community.bistudio.com/wiki/PreProcessor_Commands
+  const PREPROCESSOR = {
+    className: 'meta',
+    begin: /#\s*[a-z]+\b/,


Does this need to start at the beginning of a line?

Does this need to start at the beginning of a line?

Whitespaces are allowed too. Will update this too.

joshgoebel · 2023-01-07T17:53:27Z

src/languages/sqf.js

+    ],
+      illegal: [
+      //$ is only valid when used with Hex numbers (e.g. $FF) or at the beginning of localized strings (e.g. "$STR_HELLO")
+      /\$[^Sa-fA-F0-9]/, 


What is the S here?

What is the S here?

I wasn't sure if it would flag a string like "$STR_bla" as illegal. (which are localized strings)
It was just my lazy attempt to prevent it...

I'm not sure I yet follow how one knows it's a localized string - they alway have a $STR prefix? If it's actually quoted though then it's already handled by STRINGS rule and doesn't need to be guarded against here since its inside the string scope already, unless I'm missing something?

I'm not sure I yet follow how one knows it's a localized string - they alway have a $STR prefix? If it's actually quoted though then it's already handled by STRINGS rule and doesn't need to be guarded against here since its inside the string scope already, unless I'm missing something?

Yeah if the string rule prevents it I should remove it. I didn't actually test this to be sure.

src/languages/sqf.js

joshgoebel · 2023-01-07T17:57:35Z

src/languages/sqf.js

+    'waitUntil', 'while', 'with'
+  ];
+
+  const LITERAL = [


This is a LOT of literals. Consider variable.constant and variable.language perhaps... pi (if it's math) seems like a reference to a literal (a constant), not a literal itself.

I won't force any changes here since I dunno the language, but just making you aware we have more scopes to differentiate these sorts of things.

This is a LOT of literals. Consider variable.constant and variable.language perhaps... pi (if it's math) seems like a reference to a literal (a constant), not a literal itself.

I won't force any changes here since I dunno the language, but just making you aware we have more scopes to differentiate these sorts of things.

Technically they're all commands (so they should be part of built-in array). They're what we call "nular (sic) commands" (commands with no left or right params, i.e. they behave like functions with no params or sometimes global variables)
Again this is from previous contributions so I didn't want to change them.

Could you point me to the list of scopes you guys have?

https://highlightjs.readthedocs.io/en/latest/css-classes-reference.html

Technically they're all commands (so they should be part of built-in array).

Let's not do that. :-). For first party grammars we take a "wider perspective" view of such things. Literal concepts that are non-reducible like true, false, null, nil, undefined... these are considered literals. We prefer consistency in this across our grammars - rather than adhering to any particular grammars technicalities.

Since pi is simply a label for 3.1459 etc it would be better thought of as a variable.constant... and the fact that what provides that is a function pi() doesn't really change that "wider perspective" categorization.

Dahlgren · 2023-01-07T18:21:53Z

P.S: I think GitHub's diff is broken because it shows the entire file has changed. It looks correct in VSCode though.

Your new file has different line endings on most/all lines, resave with same as the previous version

src/languages/sqf.js

Dahlgren · 2023-01-07T18:56:09Z

src/languages/sqf.js

@@ -2506,7 +2629,7 @@ export default function(hljs) {
      hljs.C_BLOCK_COMMENT_MODE
    ]
  };
-
+  


Suggested change

Dahlgren · 2023-01-07T18:56:31Z

src/languages/sqf.js

-    'worldToScreen',
-  ];
+    'worldToScreen'
+    ];


Suggested change

];

];

Dahlgren · 2023-01-07T18:57:00Z

src/languages/sqf.js

@@ -2424,7 +2543,7 @@ export default function(hljs) {
    'vestMagazines',
    'viewDistance',
    'visibleCompass',
-    'visibleGPS',
+    'visibleGps',


Suggested change

'visibleGps',

'visibleGPS',

https://community.bistudio.com/wiki/visibleGPS

Dahlgren · 2023-01-07T19:00:42Z

src/languages/sqf.js

    'getUserMFDText',
    'getUserMFDValue',
    'getVariable',
    'getVehicleCargo',
-    'getVehicleTIPars',
+    'getVehicleTiPars',


Suggested change

'getVehicleTiPars',

'getVehicleTIPars',

https://community.bistudio.com/wiki/getVehicleTIPars

Dahlgren · 2023-01-07T19:03:37Z

src/languages/sqf.js

    'setTimeMultiplier',
+    'setTiParameter',


Suggested change

'setTiParameter',

'setTIParameter',

https://community.bistudio.com/wiki/setTIParameter

Dahlgren · 2023-01-07T19:03:59Z

src/languages/sqf.js

    'setVehicleLock',
    'setVehiclePosition',
    'setVehicleRadar',
    'setVehicleReceiveRemoteTargets',
    'setVehicleReportOwnPosition',
    'setVehicleReportRemoteTargets',
-    'setVehicleTIPars',
+    'setVehicleTiPars',


Suggested change

'setVehicleTiPars',

'setVehicleTIPars',

https://community.bistudio.com/wiki/setVehicleTIPars

Dahlgren · 2023-01-07T19:04:13Z

src/languages/sqf.js

@@ -2147,7 +2269,7 @@ export default function(hljs) {
    'showCommandingMenu',
    'showCompass',
    'showCuratorCompass',
-    'showGPS',
+    'showGps',


Suggested change

'showGps',

'showGPS',

https://community.bistudio.com/wiki/showGPS

src/languages/sqf.js

Dahlgren · 2023-01-07T19:05:05Z

src/languages/sqf.js

    'sideLogic',
    'sideUnknown',
+    'sideEnemy',
+    'sideFriendly',


Not in alphabetic order

Leopard20 · 2023-01-07T19:13:34Z

I'm not gonna update this PR beyond this point, because it took way more time that I wanted to invest in it.

The point was to update the SQF commands list and fix the highlighter breaking when you put # (~~easily reproducible on Discord~~ looks like it's been fixed).

Further changes to other stuff can be made in future contributions.

Regarding the spelling changes, like I said they come from the game itself, not the wiki. I prefer to keep it as the game says, which is more correct.

joshgoebel · 2023-03-19T16:22:54Z

Indeed, case_insensitive: true, so the exact casing doesn't matter - using what the language provides for easier maintenance on our end makes the most sense.

joshgoebel · 2023-03-19T20:32:30Z

Whatever you did with line endings made this almost impossible to rebase cleanly. I finally just gave up and went with git diff x..y | patch to squash the whole history - then made another pass at converting any remaining tabs to spaces. I tried to make sure you were still noted as the committer of record.

joshgoebel reviewed Jan 7, 2023

View reviewed changes

src/languages/sqf.js Outdated Show resolved Hide resolved

joshgoebel reviewed Jan 7, 2023

View reviewed changes

src/languages/sqf.js Outdated Show resolved Hide resolved

joshgoebel reviewed Jan 7, 2023

View reviewed changes

src/languages/sqf.js Outdated Show resolved Hide resolved

joshgoebel reviewed Jan 7, 2023

View reviewed changes

Dahlgren reviewed Jan 7, 2023

View reviewed changes

joshgoebel force-pushed the main branch 5 times, most recently from 1a211e7 to 47daaf3 Compare March 19, 2023 20:29

enh(sqf) latest changes in Arma 3 v2.11

4b0ebb4

joshgoebel force-pushed the main branch from 47daaf3 to 4b0ebb4 Compare March 19, 2023 20:30

joshgoebel approved these changes Mar 19, 2023

View reviewed changes

joshgoebel merged commit 909ba4e into highlightjs:main Mar 19, 2023

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Update sqf.js to match latest changes in Arma 3 v2.11 #3686

Update sqf.js to match latest changes in Arma 3 v2.11 #3686

Leopard20 commented Jan 7, 2023 •

edited

joshgoebel Jan 7, 2023

joshgoebel Jan 7, 2023

Leopard20 Jan 7, 2023

joshgoebel Jan 7, 2023

Leopard20 Jan 7, 2023 •

edited

joshgoebel Jan 7, 2023

Leopard20 Jan 7, 2023

joshgoebel Jan 7, 2023

Leopard20 Jan 7, 2023 •

edited

joshgoebel Jan 7, 2023

Dahlgren commented Jan 7, 2023 •

edited

Dahlgren Jan 7, 2023

Dahlgren Jan 7, 2023

Dahlgren Jan 7, 2023

Dahlgren Jan 7, 2023

Dahlgren Jan 7, 2023

Dahlgren Jan 7, 2023

Dahlgren Jan 7, 2023

Dahlgren Jan 7, 2023

Leopard20 commented Jan 7, 2023 •

edited

joshgoebel commented Mar 19, 2023

joshgoebel commented Mar 19, 2023

Update sqf.js to match latest changes in Arma 3 v2.11 #3686

Update sqf.js to match latest changes in Arma 3 v2.11 #3686

Conversation

Leopard20 commented Jan 7, 2023 • edited

Changes

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Leopard20 Jan 7, 2023 • edited

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Leopard20 Jan 7, 2023 • edited

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Dahlgren commented Jan 7, 2023 • edited

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Leopard20 commented Jan 7, 2023 • edited

joshgoebel commented Mar 19, 2023

joshgoebel commented Mar 19, 2023

Leopard20 commented Jan 7, 2023 •

edited

Leopard20 Jan 7, 2023 •

edited

Leopard20 Jan 7, 2023 •

edited

Dahlgren commented Jan 7, 2023 •

edited

Leopard20 commented Jan 7, 2023 •

edited