Use futures efficiently

.github/workflows/server.yml

@@ -3,30 +3,30 @@ name: Server CI
 on:
   push:
     branches: [master]
-    tags: '**'
+    tags: "**"
     paths:
-      - 'server/**'
-      - '.github/workflows/server.yml'
+      - "server/**"
+      - ".github/workflows/server.yml"
   pull_request:
     branches: [master]
     paths:
-      - 'server/**'
-      - '.github/workflows/server.yml'
+      - "server/**"
+      - ".github/workflows/server.yml"
 
   workflow_dispatch:
 
 defaults:
   run:
-    working-directory: 'server'
+    working-directory: "server"
 
 jobs:
   build_test_deploy:
     runs-on: ${{ matrix.os }}
 
     strategy:
       matrix:
-        os: ['ubuntu-latest', 'macos-latest']
-        perl: ['5.40', '5.38', '5.36', '5.34', '5.32', '5.30', '5.28', '5.26']
+        os: ["ubuntu-latest", "macos-latest"]
+        perl: ["5.40", "5.38", "5.36", "5.34", "5.32", "5.30", "5.28", "5.26"]
 
     name: Perl ${{ matrix.perl }} on ${{ matrix.os }}
     steps:
@@ -48,6 +48,9 @@ jobs:
       - name: Run tests
         run: make test
 
+      - name: Check perltidy
+        run: (find lib -type f; find bin -type f) | xargs -n1 perltidy -ast -se -pro=../.vscode/.perltidyrc -st >/dev/null
+
       - name: Build distribution
         run: make dist
 

.vscode/settings.json

@@ -12,11 +12,13 @@
     },
     "files.exclude": {
         "client/out": true, // set this to true to hide the "out" folder with the compiled JS files
-        "client/dist": true // set this to true to hide the "dist" folder with the compiled JS files
+        "client/dist": true, // set this to true to hide the "dist" folder with the compiled JS files
+        "server/blib": true
     },
     "search.exclude": {
         "client/out": true, // set this to false to include "out" folder in search results
-        "client/dist": true // set this to false to include "dist" folder in search results
+        "client/dist": true, // set this to false to include "dist" folder in search results
+        "server/blib": true
     },
     // Turn off tsc task auto detection since we have the necessary tasks as npm scripts
     "typescript.tsc.autoDetect": "off"

server/.vscodeignore

@@ -0,0 +1 @@
+blib

server/MANIFEST

@@ -45,7 +45,9 @@ lib/PLS/Server/Response/Resolve.pm
 lib/PLS/Server/Response/Location.pm
 lib/PLS/Server/Response/WorkspaceSymbols.pm
 lib/PLS/Server/Response/Shutdown.pm
+lib/PLS/Server/Response/Sleep.pm
 lib/PLS/Server/Request/Progress.pm
+lib/PLS/Server/Request/Sleep.pm
 lib/PLS/Server/Request/Window/WorkDoneProgress/Create.pm
 lib/PLS/Server/Response/InvalidRequest.pm
 lib/PLS/Server/Message.pm
@@ -85,8 +87,8 @@ t/packets/cancel.json
 t/packets/configuration.json
 t/packets/didopen.json
 t/packets/exit.json
-t/packets/formatting.json
 t/packets/initialize.json
 t/packets/initialized.json
 t/packets/shutdown.json
+t/packets/sleep.json
 t/Communicate.pm

server/lib/PLS/Parser/Document.pm

@@ -1414,7 +1414,7 @@ sub find_word_under_cursor
           or $_->type eq 'PPI::Token::QuoteLike::Regexp'
           or $_->type eq 'PPI::Token::QuoteLike::Command'
           or $_->element->isa('PPI::Token::Regexp');
-    };
+    }; ## end $predicate = sub
     my $element          = first { $predicate->() or $_->type eq 'PPI::Token::Operator' } @in_range;
     my $closest_operator = first { $_->type eq 'PPI::Token::Operator' } grep { $_->lsp_column_number < $character } @elements;
 

server/lib/PLS/Parser/Index.pm

@@ -171,14 +171,14 @@ sub index_files
 
                         } ## end foreach my $ref (keys %{$subs...})
 
-                        return Future->done($file);
+                        return $file;
                     }
                 );
             } ## end foreach my $uri (@{$uris})
 
             return Future->done(@futures);
         }
-    )->retain();
+    );
 } ## end sub index_files
 
 sub get_all_perl_files_async
@@ -221,16 +221,15 @@ sub index_workspace
     my ($self, $path) = @_;
 
     push @{$self->workspace_folders}, $path;
+    @{$self->workspace_folders} = List::Util::uniq @{$self->workspace_folders};
 
-    $self->get_all_perl_files_async($path)->then(
+    return $self->get_all_perl_files_async($path)->then(
         sub {
             my ($workspace_uris) = @_;
 
             return $self->index_files(@{$workspace_uris});
         }
-    )->then(sub { Future->wait_all(@_) })->retain();
-
-    return;
+    )->then(sub { Future->wait_all(@_) });
 } ## end sub index_workspace
 
 sub cleanup_file

server/lib/PLS/Parser/PackageSymbols.pm

@@ -9,6 +9,7 @@ use IO::Async::Loop;
 use IO::Async::Process;
 
 use PLS::JSON;
+use PLS::Util;
 
 =head1 NAME
 
@@ -83,9 +84,9 @@ sub _send_data_and_recv_result
         sub {
             my ($json) = @_;
 
-            return Future->done(eval { decode_json $json } // {});
+            return eval { decode_json $json } // {};
         },
-        sub { Future->done({}) }
+        sub { return {} }
     );
 } ## end sub _send_data_and_recv_result
 
@@ -113,14 +114,7 @@ sub _get_setup
 {
     my ($config) = @_;
 
-    require PLS::Parser::Index;
-
-    # Just use the first workspace folder as ROOT_PATH - we don't know
-    # which folder the code will ultimately be in, and it doesn't really matter
-    # for anyone except me.
-    my ($workspace_folder) = @{PLS::Parser::Index->new->workspace_folders};
-    my $cwd = $config->{cwd} // '';
-    $cwd =~ s/\$ROOT_PATH/$workspace_folder/;
+    my ($cwd) = PLS::Util::resolve_workspace_relative_path($config->{cwd}, undef, 1);
     my @setup;
     push @setup, (chdir => $cwd) if (length $cwd and -d $cwd);