Merge branch 'main' into revert-153-revert-142-update-analytics-doc

atlassian · Feb 28, 2025 · abbe343 · abbe343
2 parents aacae31 + 7723a98
commit abbe343
Show file tree

Hide file tree

Showing 7 changed files with 22 additions and 3 deletions.
diff --git a/.eslintrc.js b/.eslintrc.js
@@ -58,11 +58,17 @@ module.exports = {
             "args": "none",
             "caughtErrors": "all",
             "ignoreRestSiblings": false,
-        }],        
+        }],
         'brace-style': 'off',
         'no-throw-literal': 'error',
         'no-var': 'error',
         'prefer-const': 'error',
+        'no-cond-assign': 'error',
+        'no-multi-assign': 'error',
+        'no-unused-expressions': ['error', {
+            "allowShortCircuit": true,
+            "allowTernary": true,
+        }],
         curly: 'error',
         eqeqeq: ['error', 'always'],
         semi: 'off',

diff --git a/e2e/tests/auth.test.ts b/e2e/tests/auth.test.ts
@@ -1,3 +1,4 @@
+/* eslint-disable no-unused-expressions */
 import { expect } from 'chai';
 import { before, after, EditorView, Workbench, By, ActivityBar, SideBarView } from 'vscode-extension-tester';
 

diff --git a/e2e/tests/no-auth.test.ts b/e2e/tests/no-auth.test.ts
@@ -1,3 +1,4 @@
+/* eslint-disable no-unused-expressions */
 import { expect } from 'chai';
 import { before, ActivityBar, after, SideBarView, By, EditorView, Workbench } from 'vscode-extension-tester';
 

diff --git a/src/bitbucket/bitbucket-server/pullRequests.test.ts b/src/bitbucket/bitbucket-server/pullRequests.test.ts
@@ -18,7 +18,7 @@ import { AxiosResponse } from 'axios';
 
 describe('ServerPullRequestApi', () => {
     let api: ServerPullRequestApi;
-    let mockClient: HTTPClient = new HTTPClient('', '', '', async (errJson: AxiosResponse) => Error('some error'));
+    const mockClient: HTTPClient = new HTTPClient('', '', '', async (errJson: AxiosResponse) => Error('some error'));
     let site: BitbucketSite;
 
     beforeEach(() => {

diff --git a/src/lib/.eslintrc.js b/src/lib/.eslintrc.js
@@ -2,6 +2,11 @@ module.exports = {
     rules: {
         'no-var': 'error',
         'prefer-const': 'error',
+        'no-multi-assign': 'error',
+        'no-unused-expressions': ['error', {
+            "allowShortCircuit": true,
+            "allowTernary": true,
+        }],
         'no-restricted-imports': [
             'error',
             {

diff --git a/src/react/.eslintrc.js b/src/react/.eslintrc.js
@@ -2,6 +2,11 @@ module.exports = {
     rules: {
         'no-var': 'error',
         'prefer-const': 'error',
+        'no-multi-assign': 'error',
+        'no-unused-expressions': ['error', {
+            "allowShortCircuit": true,
+            "allowTernary": true,
+        }],
         'no-restricted-imports': [
             'error',
             {

diff --git a/src/webviews/components/issue/TextAreaEditor.tsx b/src/webviews/components/issue/TextAreaEditor.tsx
@@ -15,7 +15,8 @@ export const TextAreaEditor: React.FC<Props> = ({ value, disabled, placeholder,
 
     useEffect(() => {
         if (inputTextAreaRef.current && cursorPosition > 0) {
-            inputTextAreaRef.current.selectionStart = inputTextAreaRef.current.selectionEnd = cursorPosition;
+            inputTextAreaRef.current.selectionEnd = cursorPosition;
+            inputTextAreaRef.current.selectionStart = cursorPosition;
             inputTextAreaRef.current.focus();
         }
     }, [inputTextAreaRef, cursorPosition]);