Merge pull request #114 from CodinGame/fix-hide-code-selection

Fix hide code selection
CodinGame · May 7, 2024 · 20c4474 · 20c4474
2 parents d10363c + 8074914
commit 20c4474
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 6 deletions.
diff --git a/src/services.ts b/src/services.ts
@@ -126,10 +126,6 @@ export function isInitialized (): boolean {
 }
 
 export async function initialize (constructionOptions: IWorkbenchConstructionOptions = {}, container?: HTMLElement): Promise<void> {
-  if (typeof process !== 'undefined') {
-    console.warn('`process` detected. It may have negative impacts on VSCode behavior')
-  }
-
   if (constructionOptions.workspaceProvider == null) {
     constructionOptions = {
       ...constructionOptions,

diff --git a/src/tools.ts b/src/tools.ts
@@ -231,6 +231,23 @@ export function hideCodeWithoutDecoration (editor: monaco.editor.ICodeEditor, de
     hiddenAreas.push(monaco.Range.fromPositions(position, model.getFullModelRange().getEndPosition()))
 
     editor.setHiddenAreas(hiddenAreas, hideId)
+
+    // Make sure only visible code is selected
+    const selections = editor.getSelections()
+    if (selections != null) {
+      const visibleRanges = editor._getViewModel()!.getModelVisibleRanges()
+      let newSelections = selections.flatMap(selection =>
+        visibleRanges.map(visibleRange => selection.intersectRanges(visibleRange))
+          .filter((range): range is monaco.Range => range != null)
+          .map(range => monaco.Selection.fromRange(range, selection.getDirection()))
+      )
+      if (newSelections.length === 0 && visibleRanges.length > 0) {
+        newSelections = [monaco.Selection.fromPositions(visibleRanges[0]!.getStartPosition())]
+      }
+      if (newSelections.length > 0) {
+        editor.setSelections(newSelections)
+      }
+    }
   }
 
   const disposableStore = new DisposableStore()

diff --git a/src/types/monaco.d.ts b/src/types/monaco.d.ts
@@ -1,4 +1,4 @@
-import { IRange } from 'monaco-editor'
+import { IRange, Range } from 'monaco-editor'
 
 declare module 'monaco-editor' {
     namespace editor {
@@ -8,7 +8,8 @@ declare module 'monaco-editor' {
             setHiddenAreas(ranges: IRange[], source?: unknown): void
 
             _getViewModel(): {
-                getHiddenAreas(): IRange[]
+                getHiddenAreas(): Range[]
+                getModelVisibleRanges(): Range[]
             } | undefined
         }
     }