Re-enable intellisense on android

microsoft · Oct 25, 2024 · cc62e91 · cc62e91
1 parent 712a05f
commit cc62e91
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 11 deletions.
diff --git a/pxteditor/monaco.ts b/pxteditor/monaco.ts
@@ -93,7 +93,6 @@ function setupMonaco() {
 export function createEditor(element: HTMLElement): monaco.editor.IStandaloneCodeEditor {
     const inverted = pxt.appTarget.appTheme.invertedMonaco;
     const hasFieldEditors = !!(pxt.appTarget.appTheme.monacoFieldEditors && pxt.appTarget.appTheme.monacoFieldEditors.length);
-    const isAndroid = pxt.BrowserUtils.isAndroid();
 
     let editor = monaco.editor.create(element, {
         model: null,
@@ -120,15 +119,14 @@ export function createEditor(element: HTMLElement): monaco.editor.IStandaloneCod
         theme: inverted ? 'vs-dark' : 'vs',
         renderIndentGuides: true,
         accessibilityHelpUrl: "", //TODO: Add help url explaining how to use the editor with a screen reader
-        // disable completions on android
         quickSuggestions: {
-            "other": !isAndroid,
-            "comments": !isAndroid,
-            "strings": !isAndroid
+            "other": true,
+            "comments": true,
+            "strings": true
        },
-        acceptSuggestionOnCommitCharacter: !isAndroid,
-        acceptSuggestionOnEnter: !isAndroid ? "on" : "off",
-        accessibilitySupport: !isAndroid ? "on" : "off"
+        acceptSuggestionOnCommitCharacter: true,
+        acceptSuggestionOnEnter: "on",
+        accessibilitySupport: "on"
     });
 
     editor.layout();
@@ -262,4 +260,4 @@ function initTypeScriptLanguageDefinition() {
         noLib: true,
         mouseWheelZoom: false
      });
-}
+}
diff --git a/webapp/src/monaco.tsx b/webapp/src/monaco.tsx
@@ -636,10 +636,9 @@ export class Editor extends toolboxeditor.ToolboxEditor {
 
     display(): JSX.Element {
         const showErrorList = pxt.appTarget.appTheme.errorList;
-        const isAndroid = pxt.BrowserUtils.isAndroid();
 
         return (
-            <div id="monacoEditorArea" className={`monacoEditorArea ${isAndroid ? "android" : ""}`} style={{ direction: 'ltr' }}>
+            <div id="monacoEditorArea" className={`monacoEditorArea`} style={{ direction: 'ltr' }}>
                 {this.isVisible && <div className={`monacoToolboxDiv ${(this.toolbox && !this.toolbox.state.visible && !this.isDebugging()) ? 'invisible' : ''}`}>
                     <toolbox.Toolbox ref={this.handleToolboxRef} editorname="monaco" parent={this} />
                     <div id="monacoDebuggerToolbox"></div>