We read every piece of feedback, and take your input very seriously.
To see all available qualifiers, see our documentation.
1 parent 4a71a13 commit 1845c6dCopy full SHA for 1845c6d
5 files changed
.gitignore
@@ -1,3 +1,4 @@
1
/target
2
test.nix
3
test/
4
+result
flake.nix
@@ -25,10 +25,10 @@
25
craneLib = (crane.mkLib pkgs).overrideToolchain (p: p.rust-bin.nightly.latest.default.override {});
26
27
commonArgs = {
28
- src = craneLib.cleanCargoSource ./.;
+ src = pkgs.lib.cleanSource ./.;
29
strictDeps = true;
30
31
- buildInputs = with pkgs; [
+ nativeBuildInputs = with pkgs; [
32
protobuf
33
];
34
@@ -42,6 +42,7 @@
42
crate = craneLib.buildPackage (commonArgs
43
// {
44
cargoArtifacts = craneLib.buildDepsOnly commonArgs;
45
+ doCheck = false;
46
});
47
in {
48
packages.default = crate;
src/analyzer.rs
@@ -6,7 +6,6 @@ use crate::file_types::{init_file_info, FileInfo, FileType, LockedFlake};
6
use crate::flakes::get_flake_inputs;
7
use crate::hover::HoverResult;
8
use crate::safe_stringification::safe_stringify_flake;
9
-use crate::schema::{Schema, HOME_MANAGER_SCHEMA};
10
use crate::syntax::parse;
11
use crate::{completion, hover};
12
use anyhow::{anyhow, bail, Context, Result};
@@ -16,7 +15,6 @@ use ropey::Rope;
16
15
use std::collections::HashMap;
17
use std::path::{Path, PathBuf};
18
use std::process::Stdio;
19
-use std::sync::Arc;
20
use tokio::process::Command;
21
22
#[derive(Debug)]
src/hover.rs
@@ -3,8 +3,7 @@ use lsp_types::Range;
use rnix::{ast::Expr, TextRange};
use ropey::Rope;
5
use rowan::ast::AstNode;
-use std::{ops::Not, path::PathBuf};
-use tokio::sync::OwnedRwLockWriteGuard;
+use std::path::PathBuf;
use crate::{
evaluator::{proto::HoverRequest, Evaluator},
src/lsp.rs
@@ -3,9 +3,9 @@ use lsp_server::{Connection, ExtractError, Message, Notification, Request, Reque
use lsp_types::{
notification::{DidChangeTextDocument, DidOpenTextDocument},
request::{Completion, Formatting, GotoDefinition, HoverRequest},
- CompletionOptions, CompletionResponse, GotoDefinitionParams, GotoDefinitionResponse, Hover,
- HoverContents, HoverProviderCapability, InitializeParams, Location, MarkupContent, MarkupKind,
- OneOf, Position, Range, ServerCapabilities, TextDocumentSyncCapability, TextDocumentSyncKind,
+ CompletionOptions, CompletionResponse, GotoDefinitionResponse, Hover, HoverContents,
+ HoverProviderCapability, InitializeParams, Location, MarkupContent, MarkupKind, OneOf,
+ Position, Range, ServerCapabilities, TextDocumentSyncCapability, TextDocumentSyncKind,
TextEdit, Uri, WorkDoneProgressOptions,
};
use std::{
0 commit comments