Skip to content
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.

Sign up for GitHub

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

Include style files in logging indexable roots #3307

Merged
merged 9 commits into from
Nov 24, 2023
Merged

Include style files in logging indexable roots #3307

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
5cd666f
Include style files in logging indexable roots
PHPirates Nov 7, 2023
473a0f2
Updates
PHPirates Nov 7, 2023
47a7d87
Include bib files in package location cache, as it is used for input …
PHPirates Nov 8, 2023
6bce73f
Ignore all non-TeXiFy indexing exceptions like #3306
PHPirates Nov 8, 2023
4fe517b
Remove unused code
PHPirates Nov 24, 2023
5f75650
Merge pull request #3308 from Hannah-Sten/library-bib-resolve
PHPirates Nov 24, 2023
99b8450
Merge pull request #3309 from Hannah-Sten/index-exceptions
PHPirates Nov 24, 2023
bb3b022
Merge branch 'master' into logging
PHPirates Nov 24, 2023
8c0e226
We do need the dlls
PHPirates Nov 24, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 18 additions & 3 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,20 @@

### Fixed

## [0.9.2-alpha.4] - 2023-11-07

### Added

* Add some missing starred versions of table environments
* Add support for package indexing for native TeX Live installations

### Fixed

* Fix structure view nesting
* Fix some bugs in the math environment toggle intention
* Fix support for inlining commands in non-IntelliJ IDEs, by @jojo2357
* Fix a sync issue with remote libraries

## [0.9.2-alpha.3] - 2023-10-19

### Added
Expand Down Expand Up @@ -259,10 +273,11 @@ Thanks to @jojo2357 and @MisterDeenis for contributing to this release!
* Fix some intention previews. ([#2796](https://github.com/Hannah-Sten/TeXiFy-IDEA/issues/2796))
* Other small bug fixes and improvements. ([#2776](https://github.com/Hannah-Sten/TeXiFy-IDEA/issues/2776), [#2774](https://github.com/Hannah-Sten/TeXiFy-IDEA/issues/2774), [#2765](https://github.com/Hannah-Sten/TeXiFy-IDEA/issues/2765)-[#2773](https://github.com/Hannah-Sten/TeXiFy-IDEA/issues/2773))

[Unreleased]: https://github.com/Hannah-Sten/TeXiFy-IDEA/compare/v0.9.2-alpha.3...HEAD
[0.9.2-alpha.2]: https://github.com/Hannah-Sten/TeXiFy-IDEA/compare/v0.9.2-alpha.1...v0.9.2-alpha.2
[0.9.2-alpha.1]: https://github.com/Hannah-Sten/TeXiFy-IDEA/compare/v0.9.1...v0.9.2-alpha.1
[Unreleased]: https://github.com/Hannah-Sten/TeXiFy-IDEA/compare/v0.9.2-alpha.4...HEAD
[0.9.2-alpha.3]: https://github.com/Hannah-Sten/TeXiFy-IDEA/compare/v0.9.2-alpha.2...v0.9.2-alpha.3
[0.9.2-alpha.1]: https://github.com/Hannah-Sten/TeXiFy-IDEA/compare/v0.9.1...v0.9.2-alpha.1
[0.9.2-alpha.2]: https://github.com/Hannah-Sten/TeXiFy-IDEA/compare/v0.9.2-alpha.1...v0.9.2-alpha.2
[0.9.2-alpha.4]: https://github.com/Hannah-Sten/TeXiFy-IDEA/compare/v0.9.2-alpha.3...v0.9.2-alpha.4
[0.9.1]: https://github.com/Hannah-Sten/TeXiFy-IDEA/compare/v0.9.0...v0.9.1
[0.9.0]: https://github.com/Hannah-Sten/TeXiFy-IDEA/compare/v0.7.33...v0.9.0
[0.7.33]: https://github.com/Hannah-Sten/TeXiFy-IDEA/compare/v0.7.32...v0.7.33
Expand Down
35 changes: 18 additions & 17 deletions build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@ fun properties(key: String) = project.findProperty(key).toString()
// Supersedes the use of "buildscript" block and "apply plugin:"
plugins {
id("org.jetbrains.intellij") version "1.16.0"
kotlin("jvm") version ("1.9.0")
kotlin("plugin.serialization") version ("1.9.0")
kotlin("jvm") version ("1.9.20")
kotlin("plugin.serialization") version ("1.9.20")

// Plugin which can check for Gradle dependencies, use the help/dependencyUpdates task.
id("com.github.ben-manes.versions") version "0.49.0"
Expand All @@ -29,7 +29,7 @@ plugins {
id("org.jlleitschuh.gradle.ktlint") version "11.3.2"

// Vulnerability scanning
id("org.owasp.dependencycheck") version "8.4.0"
id("org.owasp.dependencycheck") version "8.4.2"

id("org.jetbrains.changelog") version "2.2.0"

Expand Down Expand Up @@ -77,8 +77,9 @@ tasks.compileTestKotlin {
dependencies {
// Local dependencies
implementation(files("lib/pretty-tools-JDDE-2.1.0.jar"))
implementation(files("lib/JavaDDE.dll"))
implementation(files("lib/JavaDDEx64.dll"))
// These lines can sometimes be problematic on Linux
// implementation(files("lib/JavaDDE.dll"))
// implementation(files("lib/JavaDDEx64.dll"))
PHPirates marked this conversation as resolved.
Show resolved Hide resolved

// D-Bus Java bindings
implementation("com.github.hypfvieh:dbus-java:3.3.2")
Expand All @@ -87,7 +88,7 @@ dependencies {
// Unzipping tar.xz/tar.bz2 files on Windows containing dtx files
implementation("org.codehaus.plexus:plexus-component-api:1.0-alpha-33")
implementation("org.codehaus.plexus:plexus-container-default:2.1.1")
implementation("org.codehaus.plexus:plexus-archiver:4.8.0")
implementation("org.codehaus.plexus:plexus-archiver:4.9.0")

// Parsing json
implementation("com.beust:klaxon:5.6")
Expand All @@ -98,13 +99,13 @@ dependencies {
implementation("com.fasterxml.jackson.module:jackson-module-kotlin:2.15.3")

// Http requests
implementation("io.ktor:ktor-client-core:2.3.5")
implementation("io.ktor:ktor-client-cio:2.3.5")
implementation("io.ktor:ktor-client-auth:2.3.5")
implementation("io.ktor:ktor-client-content-negotiation:2.3.5")
implementation("io.ktor:ktor-server-core:2.3.5")
implementation("io.ktor:ktor-server-jetty:2.3.5")
implementation("io.ktor:ktor-serialization-kotlinx-json:2.3.5")
implementation("io.ktor:ktor-client-core:2.3.6")
implementation("io.ktor:ktor-client-cio:2.3.6")
implementation("io.ktor:ktor-client-auth:2.3.6")
implementation("io.ktor:ktor-client-content-negotiation:2.3.6")
implementation("io.ktor:ktor-server-core:2.3.6")
implementation("io.ktor:ktor-server-jetty:2.3.6")
implementation("io.ktor:ktor-serialization-kotlinx-json:2.3.6")

// Comparing versions
implementation("org.apache.maven:maven-artifact:4.0.0-alpha-7")
Expand All @@ -127,14 +128,14 @@ dependencies {

// Also implementation junit 4, just in case
testImplementation("junit:junit:4.13.2")
testRuntimeOnly("org.junit.vintage:junit-vintage-engine:5.10.0")
testRuntimeOnly("org.junit.vintage:junit-vintage-engine:5.10.1")

// Use junit 5 for test cases
testImplementation("org.junit.jupiter:junit-jupiter-api:5.10.0")
testRuntimeOnly("org.junit.jupiter:junit-jupiter-engine:5.10.0")
testImplementation("org.junit.jupiter:junit-jupiter-api:5.10.1")
testRuntimeOnly("org.junit.jupiter:junit-jupiter-engine:5.10.1")

// Enable use of the JUnitPlatform Runner within the IDE
testImplementation("org.junit.platform:junit-platform-runner:1.10.0")
testImplementation("org.junit.platform:junit-platform-runner:1.10.1")

testImplementation("io.mockk:mockk:1.13.8")

Expand Down
2 changes: 1 addition & 1 deletion gradle.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
pluginVersion = 0.9.2-alpha.3
pluginVersion = 0.9.2-alpha.4

# Info about build ranges: https://www.jetbrains.org/intellij/sdk/docs/basics/getting_started/build_number_ranges.html
# Note that an xyz branch corresponds to version 20xy.z and a since build of xyz.*
Expand Down
2 changes: 1 addition & 1 deletion src/nl/hannahsten/texifyidea/index/file/LatexIndexableSetContributor.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,6 @@ class LatexIndexableSetContributor : IndexableSetContributor() {
// Add source files
val roots = LatexSdkUtil.getSdkSourceRoots(project) { sdk, homePath -> sdk.getDefaultSourcesPath(homePath) }.toMutableSet()
// Check if we possibly need to extract files first
Log.debug("Indexing source roots $roots")
for (root in roots) {
if (root.path.contains("MiKTeX", ignoreCase = true) && !extractedFiles) {
try {
Expand All @@ -50,6 +49,7 @@ class LatexIndexableSetContributor : IndexableSetContributor() {
// Unfortunately, since .sty is a LaTeX file type, these will all be parsed, which will take an enormous amount of time.
// Note that using project-independent getAdditionalRootsToIndex does not fix this
roots.addAll(LatexSdkUtil.getSdkSourceRoots(project) { sdkType, homePath -> sdkType.getDefaultStyleFilesPath(homePath) })
Log.debug("Indexing source roots $roots")

return roots
}
Expand Down