Update the latest vscode-html-languageserver

LSP-html.sublime-settings

@@ -7,11 +7,24 @@
 				"scopes": ["text.html.basic"],
 				"syntaxes": [
 					"Packages/HTML/HTML.sublime-syntax",
-					"Packages/PHP/PHP.sublime-syntax"
-				]
-			}
+					"Packages/PHP/PHP.sublime-syntax",
+				],
+			},
 		],
-		"initializationOptions": {},
-		"settings": {}
-	}
-}
+		"initializationOptions": {
+			"provideFormatter": true,
+			"embeddedLanguages": {
+				"css": true,
+				"html": true,
+				"javascript": true,
+			},
+		},
+		"settings": {
+			"html": {
+				"format": {
+					"enable": true,
+				},
+			},
+		},
+	},
+}

plugin.py

@@ -1,94 +1,78 @@
 import shutil
 import os
 import sublime
-import threading
-import subprocess
 
 from LSP.plugin.core.handlers import LanguageHandler
-from LSP.plugin.core.settings import ClientConfig, LanguageConfig, read_client_config
+from LSP.plugin.core.settings import ClientConfig, read_client_config
+from .utils.resources import ServerNpmResource
+
+PACKAGE_NAME = 'LSP-html'
+SETTINGS_FILENAME = 'LSP-html.sublime-settings'
+SERVER_DIRECTORY = 'vscode-html'
+SERVER_BINARY_PATH = os.path.join(SERVER_DIRECTORY, 'out', 'htmlServerMain.js')
+
+server = ServerNpmResource(PACKAGE_NAME, SERVER_DIRECTORY, SERVER_BINARY_PATH)
 
-package_path = os.path.dirname(__file__)
-server_path = os.path.join(package_path, 'node_modules', 'vscode-html-languageserver-bin', 'htmlServerMain.js')
 
 def plugin_loaded():
-    is_server_installed = os.path.isfile(server_path)
-    print('LSP-html: Server {} installed.'.format('is' if is_server_installed else 'is not' ))
-
-    # install the node_modules if not installed
-    if not is_server_installed:
-        # this will be called only when the plugin gets:
-        # - installed for the first time,
-        # - or when updated on package control
-        logAndShowMessage('LSP-html: Installing server.')
-
-        runCommand(
-            onCommandDone,
-            ["npm", "install", "--verbose", "--prefix", package_path, package_path]
-        )
-
-
-def onCommandDone():
-    logAndShowMessage('LSP-html: Server installed.')
-
-
-def runCommand(onExit, popenArgs):
-    """
-    Runs the given args in a subprocess.Popen, and then calls the function
-    onExit when the subprocess completes.
-    onExit is a callable object, and popenArgs is a list/tuple of args that
-    would give to subprocess.Popen.
-    """
-    def runInThread(onExit, popenArgs):
-        try:
-            if sublime.platform() == 'windows':
-                subprocess.check_call(popenArgs, shell=True)
-            else:
-                subprocess.check_call(popenArgs)
-            onExit()
-        except subprocess.CalledProcessError as error:
-            logAndShowMessage('LSP-html: Error while installing the server.', error)
-        return
-    thread = threading.Thread(target=runInThread, args=(onExit, popenArgs))
-    thread.start()
-    # returns immediately after the thread starts
-    return thread
+    server.setup()
 
 
-def is_node_installed():
-    return shutil.which('node') is not None
+def plugin_unloaded():
+    server.cleanup()
 
 
-def logAndShowMessage(msg, additional_logs=None):
-    print(msg, '\n', additional_logs) if additional_logs else print(msg)
-    sublime.active_window().status_message(msg)
+def is_node_installed():
+    return shutil.which('node') is not None
 
 
 class LspHtmlPlugin(LanguageHandler):
     @property
     def name(self) -> str:
-        return 'lsp-html'
+        return PACKAGE_NAME.lower()
 
     @property
     def config(self) -> ClientConfig:
-        settings = sublime.load_settings("LSP-html.sublime-settings")
+        settings = sublime.load_settings(SETTINGS_FILENAME)
         client_configuration = settings.get('client')
+        if client_configuration is None:
+            client_configuration = {}
+
+        # Calling setup() also here as this might run before `plugin_loaded`.
+        # Will be a no-op if already ran.
+        # See https://github.com/sublimelsp/LSP/issues/899
+        server.setup()
+
         default_configuration = {
-            "command": [
-                'node',
-                server_path,
-                '--stdio'
-            ],
+            "enabled": True,
+            "command": ['node', server.binary_path, '--stdio'],
             "languages": [
                 {
                     "languageId": "html",
                     "scopes": ["text.html.basic"],
                     "syntaxes": [
                         "Packages/HTML/HTML.sublime-syntax",
-                        "Packages/PHP/PHP.sublime-syntax"
-                    ]
-                }
-            ]
+                        "Packages/PHP/PHP.sublime-syntax",
+                    ],
+                },
+            ],
+            "initializationOptions": {
+                "provideFormatter": True,
+                "embeddedLanguages": {
+                    "css": True,
+                    "html": True,
+                    "javascript": True,
+                },
+            },
+            "settings": {
+                "html": {
+                    "format": {
+                        "enable": True,
+                    },
+                },
+            },
         }
+
         default_configuration.update(client_configuration)
         return read_client_config('lsp-html', default_configuration)