style: fix restrict-template-expressions rule violations

Marus · Jan 17, 2025 · 5ce25a1 · 5ce25a1
1 parent d855332
commit 5ce25a1
Show file tree

Hide file tree

Showing 7 changed files with 17 additions and 18 deletions.
diff --git a/eslint.config.mjs b/eslint.config.mjs
@@ -79,7 +79,6 @@ export default tseslint.config(
             '@typescript-eslint/no-require-imports': 'off',             // 24 instances
             'no-cond-assign': 'off',                                    // 21 instances
             'no-empty': 'off',                                          // 19 instances
-            '@typescript-eslint/restrict-template-expressions': 'off',  // 17 instances
             '@typescript-eslint/require-await': 'off',                  // 11 instances
         }
     },

diff --git a/src/backend/symbols.ts b/src/backend/symbols.ts
@@ -570,7 +570,7 @@ export class SymbolTable {
             try {
                 await p.promise;
             } catch (e) {
-                this.gdbSession.handleMsg('log', `Failed running: ${[p.args.join(' ')]}.\n    ${e}`);
+                this.gdbSession.handleMsg('log', `Failed running: ${p.args.join(' ')}.\n    ${e}`);
             }
         }
         return Promise.resolve();

diff --git a/src/frontend/configprovider.ts b/src/frontend/configprovider.ts
@@ -184,7 +184,7 @@ export class CortexDebugConfigurationProvider implements vscode.DebugConfigurati
             config.showDevDebugOutput = configuration.get(CortexDebugKeys.DEV_DEBUG_MODE, ADAPTER_DEBUG_MODE.NONE);
         }
         if (!sanitizeDevDebug(config as unknown)) {
-            const modes = Object.values(ADAPTER_DEBUG_MODE);
+            const modes = Object.values(ADAPTER_DEBUG_MODE).join(',');
             vscode.window.showInformationMessage(`launch.json: "showDevDebugOutput" muse be one of ${modes}. Setting to "${config.showDevDebugOutput}"`);
         }
 

diff --git a/src/frontend/rtos/rtos.ts b/src/frontend/rtos/rtos.ts
@@ -462,16 +462,16 @@ class RTOSViewProvider implements vscode.WebviewViewProvider {
                 <meta http-equiv="Content-Security-Policy" content="default-src 'none';
                 style-src 'nonce-${nonce}' ${webview.cspSource}; script-src 'nonce-${nonce}';">
                 <meta name="viewport" content="width=device-width, initial-scale=1.0">
-                <link href="${rtosStyle}" rel="stylesheet">
+                <link href="${rtosStyle.toString()}" rel="stylesheet">
                 <style nonce="${nonce}">
                 ${htmlInfo.css}
                 </style>
                 <title>RTOS Threads</title>
             </head>
             <body>
                 ${htmlInfo.html}
-                <script type="module" nonce="${nonce}" src="${toolkitUri}"></script>
-                <script type="module" nonce="${nonce}" src="${scriptUri}"></script>
+                <script type="module" nonce="${nonce}" src="${toolkitUri.toString()}"></script>
+                <script type="module" nonce="${nonce}" src="${scriptUri.toString()}"></script>
             </body>
             </html>`;
         return ret;

diff --git a/src/remote/src/tcpportscanner.ts b/src/remote/src/tcpportscanner.ts
@@ -100,7 +100,7 @@ export class TcpPortScanner {
 
         return new Promise(async (resolve, reject) => {
             const results = await Promise.all(promises.map((p) => p.then((x) => x).catch((e) => e)));
-            ConsoleLog(`isPortInUseEx: Results ${results}`);
+            ConsoleLog('isPortInUseEx: Results', results);
             for (const r of results) {
                 if (r !== false) {
                     resolve(true);
@@ -149,15 +149,15 @@ export class TcpPortScanner {
                     const endTime = process.hrtime(startTine);
                     if (inUse) {
                         busyPorts.push(port);
-                        ConsoleLog(`Busy ports = ${busyPorts}`);
+                        ConsoleLog('Busy ports', busyPorts);
                     } else {
                         if (consecutive && (freePorts.length > 0)
                             && (port !== (1 + freePorts[freePorts.length - 1]))) {
                             ConsoleLog('TcpPortHelper.findFreePorts: Oops, reset for consecutive ports requirement');
                             freePorts = [];
                         }
                         freePorts.push(port);
-                        ConsoleLog(`Free ports = ${freePorts}`);
+                        ConsoleLog('Free ports', freePorts);
                     }
                     if (logEnable) {
                         const ms = (endTime[1] / 1e6).toFixed(2);

diff --git a/src/tcpportscanner.ts b/src/tcpportscanner.ts
@@ -168,15 +168,15 @@ export class TcpPortScanner {
                     const endTime = process.hrtime(startTine);
                     if (inUse) {
                         busyPorts.push(port);
-                        ConsoleLog(`Busy ports = ${busyPorts}`);
+                        ConsoleLog('Busy ports', busyPorts);
                     } else {
                         if (consecutive && (freePorts.length > 0)
                             && (port !== (1 + freePorts[freePorts.length - 1]))) {
                             ConsoleLog('TcpPortHelper.findFreePorts: Oops, reset for consecutive ports requirement');
                             freePorts = [];
                         }
                         freePorts.push(port);
-                        ConsoleLog(`Free ports = ${freePorts}`);
+                        ConsoleLog('Free ports', freePorts);
                     }
                     if (logEnable) {
                         const ms = (endTime[1] / 1e6).toFixed(2);

diff --git a/test/suite/tcpportscanner.test.ts b/test/suite/tcpportscanner.test.ts
@@ -36,12 +36,12 @@ suite('TcpPortScanner Tests', () => {
         const hostNameOrIp = '0.0.0.0';
         timeIt();
         await TcpPortScanner.findFreePorts(args, hostNameOrIp).then((ret) => {
-            if (doLog) { console.log(`Found free ports ${ret}, ${timeIt()}`); }
+            if (doLog) { console.log('Found free ports', ret, timeIt()); }
             ports = ret;
-            assert.strictEqual(ports.length, args.retrieve, `wrong number of ports ${ports}`);
+            assert.strictEqual(ports.length, args.retrieve, `wrong number of ports ${ports.join(',')}`);
             assert.strictEqual(ports[0] >= args.min, true);
             assert.strictEqual(ports[args.retrieve - 1] <= args.max, true);
-            assert.deepStrictEqual(ports, ports.sort(), `ports are not ordered? ${ports}`);
+            assert.deepStrictEqual(ports, ports.sort(), `ports are not ordered? ${ports.join(',')}`);
         }).catch((e) => {
             assert.fail(`TcpPortScanner.find failed, ${timeIt()} ` + e);
         });
@@ -87,15 +87,15 @@ suite('TcpPortScanner Tests', () => {
             args.consecutive = true;
             timeIt(true);
             await TcpPortScanner.findFreePorts(args, hostNameOrIp).then((ret) => {
-                if (doLog) { console.log(`Found free consecutive ports ${ret} ${timeIt()}`); }
+                if (doLog) { console.log('Found free consecutive ports', ret, timeIt()); }
                 const newPorts = ret;
-                assert.strictEqual(newPorts.length, args.retrieve, `wrong number of ports ${newPorts}`);
+                assert.strictEqual(newPorts.length, args.retrieve, `wrong number of ports ${newPorts.join(',')}`);
                 assert.strictEqual(newPorts[0] >= args.min, true);
                 assert.strictEqual(newPorts[args.retrieve - 1] <= args.max, true);
-                assert.deepStrictEqual(newPorts, newPorts.sort(), `ports are not ordered? ${newPorts}`);
+                assert.deepStrictEqual(newPorts, newPorts.sort(), `ports are not ordered? ${newPorts.join(',')}`);
                 assert.strictEqual(newPorts.find((p) => p === port), undefined, `used port ${port} found as unused`);
                 for (let ix = 1; ix < args.retrieve; ix++) {
-                    assert.strictEqual(newPorts[ix - 1] + 1, newPorts[ix], `ports are not consecutive ${newPorts}`);
+                    assert.strictEqual(newPorts[ix - 1] + 1, newPorts[ix], `ports are not consecutive ${newPorts.join(',')}`);
                 }
             }).catch((e) => {
                 assert.fail(`TcpPortScanner.find consecutive failed ${timeIt()} ` + e);