Improvements in notebook configuration, stability and performance

- Addressed review comments
- Fixed some labels
- Improvements to NotebookUtils for conversions between line-based positions and string offsets
    - Avoiding unnecessary string split and joins
    - Added unit tests
- Notebook configurations related changes
    1. Made classpath,modulepath and add modules configs as array type on frontend
    2. Corresponding changes on backend to process the array
    3. Updated notebook configs unit tests
- Add enable-preview flag from the project context if not configured
- Addressed minor gaps in notebook cell execution
    - Correctly printing the runtime errors stacktrace
    - Handling null output stream callback
    - Performing lineEnding normalization only where required in cell setContent.
    - Minor performance improvements

Co-authored-by: Achal Talati <[email protected]>
Co-authored-by: Shivam Madan <[email protected]>
Co-authored-by: Siddharth Srinivasan <[email protected]>

Author: 3 people

THIRD_PARTY_LICENSES.txt

@@ -9835,8 +9835,11 @@ SOFTWARE.
 
 ------------------ END OF DEPENDENCY LICENSE --------------------
 
-Dependancy: nbformat
+Dependency: nbformat.v4.5.schema.json
 ====================
+Accessible at: vscode/src/notebooks/nbformat.v4.5.d7.schema.json
+Modified from source at: https://github.com/jupyter/nbformat/blob/main/nbformat/v4/nbformat.v4.5.schema.json
+License: BSD 3-Clause License
 
 ------------------ START OF DEPENDENCY LICENSE --------------------
 BSD 3-Clause License

build.xml

@@ -79,8 +79,9 @@
             patches/dev-dependency-licenses.diff
             patches/nb-telemetry.diff
             patches/change-method-parameters-refactoring-qualified-names.diff
-	        patches/upgrade-lsp4j.diff
-	        patches/java-notebooks.diff
+            patches/upgrade-lsp4j.diff
+            patches/updated-show-input-params.diff
+            patches/java-notebooks.diff
         </string>
         <filterchain>
             <tokenfilter delimoutput=" ">

nbcode/notebooks/nbproject/project.properties

@@ -15,12 +15,7 @@
 #
 javac.source=1.8
 requires.nb.javac=true
-javac.compilerargs=-Xlint -Xlint:-serial 
-test.run.args=--add-exports=jdk.compiler/com.sun.tools.javac.api=ALL-UNNAMED \
-    --add-exports=jdk.compiler/com.sun.tools.javac.code=ALL-UNNAMED \
-    --add-exports=jdk.compiler/com.sun.tools.javac.resources=ALL-UNNAMED \
-    --add-exports=jdk.compiler/com.sun.tools.javac.util=ALL-UNNAMED \
-
+javac.compilerargs=-Xlint -Xlint:-serial
 test.unit.lib.cp=
 test.unit.run.cp.extra=
 license.file=../../LICENSE.txt

nbcode/notebooks/nbproject/project.xml

@@ -29,6 +29,15 @@
                         <specification-version>2.11.0</specification-version>
                     </run-dependency>
                 </dependency>
+                <dependency>
+                    <code-name-base>org.netbeans.api.annotations.common</code-name-base>
+                    <build-prerequisite/>
+                    <compile-dependency/>
+                    <run-dependency>
+                        <release-version>1</release-version>
+                        <specification-version>1.57</specification-version>
+                    </run-dependency>
+                </dependency>
                 <dependency>
                     <code-name-base>org.netbeans.api.java</code-name-base>
                     <build-prerequisite/>
@@ -153,10 +162,10 @@
                         <recursive/>
                         <compile-dependency/>
                     </test-dependency>
-                     <test-dependency>
-                    <code-name-base>org.netbeans.modules.java.lsp.server</code-name-base>
-                         <compile-dependency/>
-                </test-dependency>
+                    <test-dependency>
+                        <code-name-base>org.netbeans.modules.java.lsp.server</code-name-base>
+                        <compile-dependency/>
+                    </test-dependency>
                 </test-type>
             </test-dependencies>
             <public-packages/>

nbcode/notebooks/src/org/netbeans/modules/nbcode/java/notebook/CellState.java

@@ -18,6 +18,7 @@
 import java.util.concurrent.CompletableFuture;
 import java.util.concurrent.ExecutionException;
 import java.util.concurrent.atomic.AtomicReference;
+import java.util.logging.Level;
 import java.util.logging.Logger;
 import org.eclipse.lsp4j.ExecutionSummary;
 import org.eclipse.lsp4j.NotebookCell;
@@ -82,7 +83,6 @@ public String getNotebookUri() {
     }
 
     public void setContent(String newContent, int newVersion) throws InterruptedException, ExecutionException {
-        String normalizedContent = NotebookUtils.normalizeLineEndings(newContent);
         VersionAwareContent currentContent = content.get();
 
         if (currentContent.getVersion() != newVersion - 1) {
@@ -99,16 +99,17 @@ public void setContent(String newContent, int newVersion) throws InterruptedExce
             int receivedVersion = newCellState.getVersion();
 
             if (receivedVersion > currentContent.getVersion()) {
-                VersionAwareContent newVersionContent = new VersionAwareContent(newCellState.getText(), receivedVersion);
-                content.set(newVersionContent);
+                VersionAwareContent newVersionContent = new VersionAwareContent(NotebookUtils.normalizeLineEndings(newCellState.getText()), receivedVersion);
+                content.updateAndGet(current -> current != currentContent && receivedVersion <= current.getVersion() ? current : newVersionContent);
             } else {
-                throw new IllegalStateException("Version mismatch: Received version to be greater than current version, received version:  " + (receivedVersion) + ", current version: " + currentContent.getVersion());
+                LOG.log(Level.WARNING, "Version mismatch: Received version to be greater than current version, received version:  {0}, current version: {1}", new Object[]{receivedVersion, currentContent.getVersion()});
             }
         } else {
-            VersionAwareContent newVersionContent = new VersionAwareContent(normalizedContent, newVersion);
+            // newContent is already normalized during applyChanges
+            VersionAwareContent newVersionContent = new VersionAwareContent(newContent, newVersion);
 
             if (!content.compareAndSet(currentContent, newVersionContent)) {
-                throw new IllegalStateException("Concurrent modification detected. Version expected: " + (newVersion - 1) + ", current: " + content.get().getVersion());
+                LOG.log(Level.WARNING, "Concurrent modification detected. Version expected: {0}, current: {1}", new Object[]{newVersion - 1, content.get().getVersion()});
             }
         }
     }
@@ -122,7 +123,7 @@ public void requestContentAndSet() throws InterruptedException, ExecutionExcepti
         if (newCellState.getVersion() <= 0) {
             throw new IllegalStateException("Received incorrect version number: " + newCellState.getVersion());
         }
-        VersionAwareContent newVersionContent = new VersionAwareContent(newCellState.getText(), newCellState.getVersion());
+        VersionAwareContent newVersionContent = new VersionAwareContent(NotebookUtils.normalizeLineEndings(newCellState.getText()), newCellState.getVersion());
         content.set(newVersionContent);
     }
 
@@ -151,8 +152,8 @@ protected VersionAwareContent getVersionAwareContent() {
 
     protected class VersionAwareContent {
 
-        private String content;
-        private int version;
+        private final String content;
+        private final int version;
 
         public VersionAwareContent(String content, int version) {
             this.content = content;
@@ -163,17 +164,8 @@ public String getContent() {
             return content;
         }
 
-        public void setContent(String content) {
-            this.content = content;
-        }
-
         public int getVersion() {
             return version;
         }
-
-        public void setVersion(int version) {
-            this.version = version;
-        }
-
     }
 }

nbcode/notebooks/src/org/netbeans/modules/nbcode/java/notebook/CodeCompletionProvider.java

@@ -16,9 +16,8 @@
 package org.netbeans.modules.nbcode.java.notebook;
 
 import java.util.ArrayList;
-import java.util.HashMap;
+import java.util.HashSet;
 import java.util.List;
-import java.util.Map;
 import java.util.concurrent.CompletableFuture;
 import java.util.logging.Level;
 import java.util.logging.Logger;
@@ -63,34 +62,27 @@ public CompletableFuture<Either<List<CompletionItem>, CompletionList>> getCodeCo
                 }
 
                 SourceCodeAnalysis sourceCodeAnalysis = instance.sourceCodeAnalysis();
-                String textToComplete = getTextToComplete(
+                List<Suggestion> suggestions = getSuggestions(
                         params.getTextDocument().getUri(),
                         params.getPosition(),
                         state,
                         sourceCodeAnalysis
                 );
 
-                List<Suggestion> suggestions = sourceCodeAnalysis.completionSuggestions(
-                        textToComplete,
-                        textToComplete.length(),
-                        new int[1]
-                );
-
                 List<CompletionItem> completionItems = new ArrayList<>();
-                Map<String, Boolean> visited = new HashMap<>();
+                HashSet<String> visited = new HashSet<>();
 
                 for (Suggestion suggestion : suggestions) {
                     String continuation = suggestion.continuation();
-                    if (!visited.containsKey(continuation)) {
+                    if (visited.add(continuation)) {
                         completionItems.add(createCompletionItem(continuation));
-                        visited.put(continuation, Boolean.TRUE);
                     }
                 }
 
                 return Either.<List<CompletionItem>, CompletionList>forLeft(completionItems);
 
             } catch (Exception e) {
-                LOG.log(Level.WARNING, "Error getting code completions: {0}", e.getMessage());
+                LOG.log(Level.WARNING, "Error getting code completions: {0}", e.toString());
                 return Either.<List<CompletionItem>, CompletionList>forLeft(new ArrayList<>());
             }
         });
@@ -103,14 +95,28 @@ private CompletionItem createCompletionItem(String label) {
         return item;
     }
 
-    private String getTextToComplete(String uri, Position position, NotebookDocumentStateManager state, SourceCodeAnalysis sourceCodeAnalysis) {
+    private List<Suggestion> getSuggestions(String uri, Position position, NotebookDocumentStateManager state, SourceCodeAnalysis sourceCodeAnalysis) {
         CellState cellState = state.getCell(uri);
         String content = cellState.getContent();
         int cursorOffset = NotebookUtils.getOffset(content, position);
-
+        int[] anchor = new int[1];
         String offsetText = content.substring(0, cursorOffset);
         List<String> snippets = NotebookUtils.getCodeSnippets(sourceCodeAnalysis, offsetText);
 
-        return snippets.isEmpty() ? "" : snippets.getLast();
+        String lastSnippet = snippets.isEmpty() ? "" : snippets.get(snippets.size()-1);
+        List<Suggestion> suggestions = new ArrayList<>();
+        suggestions.addAll(sourceCodeAnalysis.completionSuggestions(
+                lastSnippet,
+                lastSnippet.length(),
+                anchor
+        ));
+        if (snippets.size() > 1) {
+            suggestions.addAll(sourceCodeAnalysis.completionSuggestions(
+                    offsetText,
+                    offsetText.length(),
+                    anchor
+            ));
+        }
+        return suggestions;
     }
 }