Skip to content

Commit a4fe218

Browse files
committed
feat!: use tsx as default
#48 (comment) #48 (comment)
1 parent c6aa98c commit a4fe218

File tree

3 files changed

+21
-4
lines changed

3 files changed

+21
-4
lines changed

src/io/plugin/tsnode/execution/TsConfigurationEditor.kt

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -45,8 +45,7 @@ class TsConfigurationEditor(runConfig: TsRunConfiguration, project: Project) : _
4545

4646
//val tsnodePackageField = TsForm.LazyNodePackageField("&TypeScript Node package:", interpreterField, "ts-node")
4747

48-
val tsnodePackageField = TsForm.LazyNodePackageField("&TypeScript Node package:", interpreterField, listOf("tsx", "esno", "ts-node", "esm-ts-node"))
49-
48+
val tsnodePackageField = TsForm.LazyNodePackageField("&TypeScript Node package:", interpreterField, TsUtil.tsPreferredPackageList)
5049

5150
val extraTypeScriptOptionsField = TsForm.LazyRawCommandLineEditor("E&xtra ts-node options:")
5251

src/io/plugin/tsnode/execution/TsRunConfiguration.kt

Lines changed: 18 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -55,11 +55,27 @@ class TsRunConfiguration(runConfigurationModule: RunConfigurationModule, factory
5555
}
5656
}
5757

58-
fun selectedTsNodePackage(name: String = "ts-node"): NodePackage?
58+
fun selectedTsNodePackage(name: String = "tsx"): NodePackage?
5959
{
6060
if (_tsPackage == null)
6161
{
62-
val pkg = findPreferredPackage(listOf(name, "ts-node", "esm-ts-node"))
62+
val _my_list: List<String> = if (runSettings.tsnodePackage?.isValid == true)
63+
{
64+
_tsPackage = runSettings.tsnodePackage
65+
return _tsPackage
66+
67+
// listOf(runSettings.tsnodePackage!!.name)
68+
}
69+
else if (name.isNotBlank())
70+
{
71+
listOf(name)
72+
}
73+
else
74+
{
75+
listOf()
76+
}
77+
78+
val pkg = findPreferredPackage(_my_list + TsUtil.tsPreferredPackageList)
6379

6480
_tsPackage = pkg
6581

src/io/plugin/tsnode/execution/TsUtil.kt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,8 @@ object TsUtil
3838

3939
private val configurations = HashMap<String, RunnerAndConfigurationSettingsImpl>()
4040

41+
val tsPreferredPackageList: List<String> = listOf("tsx", "esno", "ts-node", "esm-ts-node")
42+
4143
fun isScratchFileType(psiFile: PsiFile): Boolean
4244
{
4345
return ScratchUtil.isScratch(psiFile.virtualFile)

0 commit comments

Comments
 (0)