fix: change default rcc and uic output file names to *_rc and *_ui

We should add an e2e test for such case in the future.

Fix #289

Author: seanwu1105

package.json

@@ -364,7 +364,7 @@
           },
           "default": [
             "-o",
-            "${resourceDirname}${pathSeparator}rc_${resourceBasenameNoExtension}.py"
+            "${resourceDirname}${pathSeparator}${resourceBasenameNoExtension}_rc.py"
           ],
           "markdownDescription": "The options passed to Qt `rcc` executable. See [here](https://github.com/seanwu1105/vscode-qt-for-python#predefined-variables) for a detailed list of predefined variables.",
           "scope": "resource"
@@ -393,7 +393,7 @@
           },
           "default": [
             "-o",
-            "${resourceDirname}${pathSeparator}ui_${resourceBasenameNoExtension}.py"
+            "${resourceDirname}${pathSeparator}${resourceBasenameNoExtension}_ui.py"
           ],
           "markdownDescription": "The options passed to Qt `uic` executable. See [here](https://github.com/seanwu1105/vscode-qt-for-python#predefined-variables) for a detailed list of predefined variables.",
           "scope": "resource"

python/.gitignore

@@ -1,2 +1,2 @@
-rc_*.py
-ui_*.py
+*_rc.py
+*_ui.py

src/test/suite/rcc/compile-resource.test.ts

@@ -5,9 +5,9 @@ import { URI } from 'vscode-uri'
 import { EXTENSION_NAMESPACE } from '../../../constants'
 import {
   E2E_TIMEOUT,
+  TEST_ASSETS_PATH,
   forceDeleteFile,
   setupE2EEnvironment,
-  TEST_ASSETS_PATH,
   waitFor,
 } from '../test-utils'
 
@@ -55,7 +55,7 @@ suite('compile-resource/e2e', () => {
               path.resolve(
                 TEST_ASSETS_PATH,
                 'qrc',
-                `rc_${sampleFilenameNoExt}.py`,
+                `${sampleFilenameNoExt}_rc.py`,
               ),
             ),
           )
@@ -69,6 +69,6 @@ suite('compile-resource/e2e', () => {
 
 async function removeGeneratedFile(sampleFilenameNoExt: string) {
   await forceDeleteFile(
-    path.resolve(TEST_ASSETS_PATH, 'qrc', `rc_${sampleFilenameNoExt}.py`),
+    path.resolve(TEST_ASSETS_PATH, 'qrc', `${sampleFilenameNoExt}_rc.py`),
   )
 }

src/test/suite/rcc/rcc-live-execution.test.ts

@@ -64,7 +64,7 @@ suite('rcc-live-execution/e2e', () => {
             path.resolve(
               TEST_ASSETS_PATH,
               'qrc',
-              `rc_${sampleQrcFilenameNoExt}.py`,
+              `${sampleQrcFilenameNoExt}_rc.py`,
             ),
           ),
         )
@@ -110,7 +110,7 @@ suite('rcc-live-execution/e2e', () => {
             path.resolve(
               TEST_ASSETS_PATH,
               'qrc',
-              `rc_${sampleQrcFilenameNoExt}.py`,
+              `${sampleQrcFilenameNoExt}_rc.py`,
             ),
           ),
         )
@@ -122,6 +122,6 @@ suite('rcc-live-execution/e2e', () => {
 
 async function removeGeneratedFile(sampleFilenameNoExt: string) {
   await forceDeleteFile(
-    path.resolve(TEST_ASSETS_PATH, 'qrc', `rc_${sampleFilenameNoExt}.py`),
+    path.resolve(TEST_ASSETS_PATH, 'qrc', `${sampleFilenameNoExt}_rc.py`),
   )
 }

src/test/suite/uic/compile-ui.test.ts

@@ -5,9 +5,9 @@ import { URI } from 'vscode-uri'
 import { EXTENSION_NAMESPACE } from '../../../constants'
 import {
   E2E_TIMEOUT,
+  TEST_ASSETS_PATH,
   forceDeleteFile,
   setupE2EEnvironment,
-  TEST_ASSETS_PATH,
   waitFor,
 } from '../test-utils'
 
@@ -55,7 +55,7 @@ suite('compile-ui/e2e', () => {
               path.resolve(
                 TEST_ASSETS_PATH,
                 'ui',
-                `ui_${sampleFilenameNoExt}.py`,
+                `${sampleFilenameNoExt}_ui.py`,
               ),
             ),
           )
@@ -69,6 +69,6 @@ suite('compile-ui/e2e', () => {
 
 async function removeGeneratedFile(sampleFilenameNoExt: string) {
   return forceDeleteFile(
-    path.resolve(TEST_ASSETS_PATH, 'ui', `ui_${sampleFilenameNoExt}.py`),
+    path.resolve(TEST_ASSETS_PATH, 'ui', `${sampleFilenameNoExt}_ui.py`),
   )
 }

src/test/suite/uic/uic-live-execution.test.ts

@@ -55,7 +55,7 @@ suite('uic-live-execution/e2e', () => {
     await waitFor(async () => {
       const readResult = await workspace.fs.readFile(
         URI.file(
-          path.resolve(TEST_ASSETS_PATH, 'ui', `ui_${sampleFilenameNoExt}.py`),
+          path.resolve(TEST_ASSETS_PATH, 'ui', `${sampleFilenameNoExt}_ui.py`),
         ),
       )
 
@@ -66,6 +66,6 @@ suite('uic-live-execution/e2e', () => {
 
 async function removeGeneratedFile(sampleFilenameNoExt: string) {
   return forceDeleteFile(
-    path.resolve(TEST_ASSETS_PATH, 'ui', `ui_${sampleFilenameNoExt}.py`),
+    path.resolve(TEST_ASSETS_PATH, 'ui', `${sampleFilenameNoExt}_ui.py`),
   )
 }