Merge pull request #25 from shader-slang/lsp

More UI fixes.

language-server.js

@@ -286,11 +286,6 @@ function initMonaco() {
 
     monaco.languages.register({ id: "spirv" });
     monaco.languages.setMonarchTokensProvider("spirv", {
-        brackets: [
-            { open: '{', close: '}', token: 'delimiter.curly' },
-            { open: '[', close: ']', token: 'delimiter.square' },
-            { open: '(', close: ')', token: 'delimiter.parenthesis' },
-        ],
         operators: [
             '=',
         ],
@@ -322,8 +317,6 @@ function initMonaco() {
                 [/;.*/, 'comment'],
 
                 // delimiters and operators
-                [/[{}()\[\]]/, '@brackets'],
-                [/[<>](?!@symbols)/, '@brackets'],
                 [/@symbols/, {
                     cases: {
                         '@operators': 'operator',

styles/styles.css

@@ -184,6 +184,7 @@ button:disabled:hover {
   background-color: var(--panel-background);
   padding: 10px;
   flex-wrap: wrap;
+  overflow-x: hidden;
 }
 
 .logo-img {
@@ -448,4 +449,14 @@ label {
 /* Visible tooltip styling */
 .tooltip.show {
   opacity: 1;
+}
+
+/* Narrow screen */
+@media screen and (max-width: 450px) {
+  .dropdown-select{
+    min-width: 100px;
+  }
+  #demo-select{
+    width: 150px;
+  }
 }

try-slang.js

@@ -439,7 +439,6 @@ var Module = {
             label.innerText = "Initializing Slang Compiler...";
         compiler = new SlangCompiler(Module);
         slangd = Module.createLanguageServer();
-        initLanguageServer();
         var result = compiler.init();
         if (result.ret) {
             document.getElementById("compile-btn").disabled = false;
@@ -486,6 +485,8 @@ function runIfFullyInitialized()
 {
     if (compiler && slangd && pageLoaded)
     {
+        initLanguageServer();
+
         const loadingScreen = document.getElementById('loading-screen');
         // Start fade-out by setting opacity to 0
         loadingScreen.style.opacity = '0';

ui.js

@@ -83,6 +83,10 @@ function prepareForResize() {
   var codeEditors = document.getElementsByClassName("editorContainer");
 
   for (var i = 0; i < codeEditors.length; i++) {
+    if (codeEditors[i].parentNode.clientWidth < 30)
+      codeEditors[i].style.display = "none";
+    else
+      codeEditors[i].style.display = "inherit";
     codeEditors[i].style.overflow = "hidden";
   }
   document.getElementById("workSpaceDiv").style.overflow = "hidden";
@@ -95,6 +99,10 @@ function finishResizing() {
     document.getElementById("leftContainerDiv").style.overflow = "visible";
     for (var i = 0; i < codeEditors.length; i++) {
       codeEditors[i].style.overflow = "visible";
+      if (codeEditors[i].parentNode.clientWidth < 30)
+        codeEditors[i].style.display = "none";
+      else
+        codeEditors[i].style.display = "inherit";
     }
 }
 
@@ -115,7 +123,7 @@ function initializeModal() {
   const closeBtn = document.querySelector(".close");
 
   btn.onclick = () => {
-    modal.style.display = "block";
+    modal.style.display = "flex";
   };
 
   closeBtn.onclick = () => {