Skip to content

Commit 86f7d69

Browse files
committed
Clean up obsolete code.
1 parent d128873 commit 86f7d69

File tree

1 file changed

+9
-15
lines changed

1 file changed

+9
-15
lines changed

ts-comint.el

Lines changed: 9 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -91,20 +91,14 @@
9191
(defvar ts-comint-buffer nil
9292
"Name of the inferior Typescript buffer.")
9393

94-
(defvar ts-prompt-regexp "^\\(?:> \\)"
95-
"Prompt for `run-ts'.")
9694

97-
98-
(defun ts--is-nodejs ()
99-
(string= "node"
100-
(substring-no-properties ts-comint-program-command -4 nil)))
101-
102-
(defun ts--guess-load-file-cmd (filename)
103-
(let ((cmd (concat "require(\"" filename "\")\n")))
104-
(when (not (ts--is-nodejs))
105-
(setq cmd (concat "load(\"" filename "\")\n")))
106-
cmd
107-
))
95+
(defun ts--get-load-file-cmd (filename)
96+
"Generate a Typescript import-statement for `FILENAME'."
97+
(concat "import * as "
98+
(file-name-base filename)
99+
" from \""
100+
(file-name-base filename)
101+
"\"\n"))
108102

109103
;;;###autoload
110104
(defun run-ts (cmd &optional dont-switch-p)
@@ -213,15 +207,15 @@ prevent switching to the new buffer once created."
213207
(interactive "f")
214208
(let ((filename (expand-file-name filename)))
215209
(run-ts ts-comint-program-command t)
216-
(comint-send-string ts-comint-buffer (ts--guess-load-file-cmd filename))))
210+
(comint-send-string ts-comint-buffer (ts--get-load-file-cmd filename))))
217211

218212
;;;###autoload
219213
(defun ts-load-file-and-go (filename)
220214
"Load file `FILENAME' in the Typescript interpreter."
221215
(interactive "f")
222216
(let ((filename (expand-file-name filename)))
223217
(run-ts ts-comint-program-command t)
224-
(comint-send-string ts-comint-buffer (ts--guess-load-file-cmd filename))
218+
(comint-send-string ts-comint-buffer (ts--get-load-file-cmd filename))
225219
(switch-to-ts ts-comint-buffer)))
226220

227221
;;;###autoload

0 commit comments

Comments
 (0)