Skip to content

Betterpathparse #305

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 13 commits into from
33 changes: 33 additions & 0 deletions .github/dependabot.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
# To get started with Dependabot version updates, you'll need to specify which
# package ecosystems to update and where the package manifests are located.
# Please see the documentation for all configuration options:
# https://docs.github.com/github/administering-a-repository/configuration-options-for-dependency-updates

# docs
# https://docs.github.com/en/code-security/dependabot/dependabot-version-updates/configuration-options-for-the-dependabot.yml-file
version: 2
updates:
- package-ecosystem: "cargo"
directory: "/"
schedule:
interval: "weekly"
# We release on Tuesdays and open dependabot PRs will rebase after the
# version bump and thus consume unnecessary workers during release, thus
# let's open new ones on Wednesday
day: "wednesday"
ignore:
- dependency-name: "*"
update-types: ["version-update:semver-patch"]
groups:
# Only update polars as a whole as there are many subcrates that need to
# be updated at once. We explicitly depend on some of them, so batch their
# updates to not take up dependabot PR slots with dysfunctional PRs
polars:
patterns:
- "polars"
- "polars-*"
- package-ecosystem: "github-actions"
directory: "/"
schedule:
interval: "weekly"
day: "wednesday"
16 changes: 10 additions & 6 deletions .github/workflows/rust.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ jobs:
build:
strategy:
matrix:
rust: [stable, nightly]
rust: [stable]
features: ["", proposed]

env:
Expand All @@ -23,17 +23,21 @@ jobs:
runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v4

- uses: actions-rs/toolchain@v1
- uses: dtolnay/rust-toolchain@stable
with:
profile: minimal
toolchain: ${{ matrix.rust }}
override: true
components: clippy

- name: Build
run: cargo build

- name: Fmt
run: cargo fmt --all -- --check

- name: clippy
run: cargo clippy --all-targets -- -D warnings

- name: Run tests
run: >
FEATURES=${{ matrix.features }}
Expand Down
19 changes: 19 additions & 0 deletions .github/workflows/typos.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
---
# yamllint disable rule:line-length
name: check_typos

on: # yamllint disable-line rule:truthy
push:
pull_request:
branches:
- '**'

jobs:
build:
runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v4

- name: typos-action
uses: crate-ci/[email protected]
24 changes: 15 additions & 9 deletions Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,11 +1,15 @@
[package]
name = "lsp-types"
version = "0.97.0"
authors = ["Markus Westerlind <[email protected]>", "Bruno Medeiros <[email protected]>"]
edition = "2018"
name = "lsp-types-f"
version = "0.98.0"
authors = [
"Markus Westerlind <[email protected]>",
"Bruno Medeiros <[email protected]>",
"Decodertalkers <[email protected]>",
]
edition = "2024"
description = "Types for interaction with a language server, using VSCode's Language Server Protocol"

repository = "https://github.com/gluon-lang/lsp-types"
repository = "https://github.com/neocmakelsp/lsp-types"
documentation = "https://docs.rs/lsp-types"

readme = "README.md"
Expand All @@ -15,11 +19,13 @@ keywords = ["language", "server", "lsp", "vscode", "lsif"]
license = "MIT"

[dependencies]
bitflags = "1.0.1"
serde = { version = "1.0.34", features = ["derive"] }
serde_json = "1.0.50"
bitflags = "2.9.0"
serde = { version = "1.0.219", features = ["derive"] }
serde_json = "1.0.140"
serde_repr = "0.1"
fluent-uri = "0.1.4"
fluent-uri = "0.3.2"
thiserror = "2.0.12"
percent-encoding = "2.3.1"

[features]
default = []
Expand Down
5 changes: 4 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# lsp-types [![Build Status](https://travis-ci.org/gluon-lang/lsp-types.svg?branch=master)](https://travis-ci.org/gluon-lang/lsp-types) [![Documentation](https://docs.rs/lsp-types/badge.svg)](https://docs.rs/crate/lsp-types)
# lsp-types-f [![Build Status](https://travis-ci.org/neocmakelsp/lsp-types.svg?branch=master)](https://travis-ci.org/neocmakelsp/lsp-types) [![Documentation](https://docs.rs/lsp-types-f/badge.svg)](https://docs.rs/crate/lsp-types)

Types useful for interacting with a [language server](https://code.visualstudio.com/blogs/2016/06/27/common-language-protocol).

Expand All @@ -7,6 +7,9 @@ Supports Language Server Protocol (LSP) version 3.16.0.
Proposed 3.17 features can be activated using the `proposed` feature flag.
- **NOTE** that these are unstable and may change between releases.

## NOTE
Fork for neocmakelsp

## Contributing

If you are making a change which adds, removes or modifies the LSP API it is highly appreciated if you link to the spec where this change is described. This gives context to whether the change should be an experimental addition and lets the reviewer double check the changes easily against the spec.
Expand Down
2 changes: 2 additions & 0 deletions _typos.toml
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
[default.extend-words]
typ = "typ"
1 change: 1 addition & 0 deletions src/completion.rs
Original file line number Diff line number Diff line change
Expand Up @@ -571,6 +571,7 @@ pub struct CompletionItemLabelDetails {
pub description: Option<String>,
}

#[allow(clippy::field_reassign_with_default)]
#[cfg(test)]
mod tests {
use super::*;
Expand Down
4 changes: 2 additions & 2 deletions src/inline_value.rs
Original file line number Diff line number Diff line change
Expand Up @@ -132,7 +132,7 @@ pub struct InlineValueEvaluatableExpression {
/// - directly as a text value (class InlineValueText).
/// - as a name to use for a variable lookup (class InlineValueVariableLookup)
/// - as an evaluatable expression (class InlineValueEvaluatableExpression)
/// The InlineValue types combines all inline value types into one type.
/// The InlineValue types combines all inline value types into one type.
///
/// @since 3.17.0
#[derive(Debug, Eq, PartialEq, Clone, Deserialize, Serialize)]
Expand Down Expand Up @@ -184,8 +184,8 @@ pub struct InlineValueWorkspaceClientCapabilities {
#[cfg(test)]
mod tests {
use super::*;
use crate::tests::test_serialization;
use crate::Position;
use crate::tests::test_serialization;

#[test]
fn inline_values() {
Expand Down
3 changes: 2 additions & 1 deletion src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ extern crate bitflags;

use std::{collections::HashMap, fmt::Debug};

use serde::{de, de::Error, Deserialize, Serialize};
use serde::{Deserialize, Serialize, de, de::Error};
use serde_json::Value;

pub use uri::Uri;
Expand Down Expand Up @@ -2386,6 +2386,7 @@ pub struct RelativePattern {
pub type Pattern = String;

bitflags! {
#[derive(Debug, Clone, Copy, PartialEq, Eq, Hash, Ord, PartialOrd)]
pub struct WatchKind: u8 {
/// Interested in create events.
const Create = 1;
Expand Down
2 changes: 1 addition & 1 deletion src/notification.rs
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
use super::*;

use serde::{de::DeserializeOwned, Serialize};
use serde::{Serialize, de::DeserializeOwned};

pub trait Notification {
type Params: DeserializeOwned + Serialize + Send + Sync + 'static;
Expand Down
2 changes: 1 addition & 1 deletion src/request.rs
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
use super::*;

use serde::{de::DeserializeOwned, Serialize};
use serde::{Serialize, de::DeserializeOwned};

pub trait Request {
type Params: DeserializeOwned + Serialize + Send + Sync + 'static;
Expand Down
Loading