diff --git a/Contents/Language Modules/Rust.bblm/Contents/Info.plist b/Contents/Language Modules/Rust.bblm/Contents/Info.plist index aad9c98..26672b6 100644 --- a/Contents/Language Modules/Rust.bblm/Contents/Info.plist +++ b/Contents/Language Modules/Rust.bblm/Contents/Info.plist @@ -1,277 +1,224 @@ - - BuildMachineOSBuild - 15B42 - - CFBundleDevelopmentRegion - English - - CFBundleExecutable - Rust - - CFBundleIdentifier - me.bsago.bblm.rust - - CFBundleInfoDictionaryVersion - 6.0 - - CFBundlePackageType - BNDL - - CFBundleSignature - BBLM - - CFBundleSupportedPlatforms - - MacOSX - - - CFBundleVersion - 8.0 - - CSResourcesFileMapped - - - DTCompiler - com.apple.compilers.llvm.clang.1_0 - - DTPlatformBuild - 7B91b - - DTPlatformVersion - GM - - DTSDKBuild - 15A278 - - DTSDKName - macosx10.11 - - DTXcode - 0710 - - DTXcodeBuild - 7B91b - - com.barebones.bblminfo - - - BBLMCanGuessLanguage - - - BBLMColorsSyntax - - - BBLMCommentLineDefault - // - - BBLMCommentPrefixDefault - /* - - BBLMCommentSuffixDefault - */ - - BBLMDroppedFilePathStyle - POSIX - - BBLMEntryPointName - rustMain - - BBLMFunctionScannerDoesFoldsToo - - - BBLMIsCaseSensitive - - - BBLMKeywords - - - Keywords - - abstract - alignof - as - become - box - break - const - continue - crate - do - else - enum - extern - false - final - fn - for - if - impl - in - let - loop - macro - macro_rules - match - mod - move - mut - offsetof - override - priv - proc - pub - pure - ref - return - self - sizeof - static - struct - super - trait - true - type - typeof - unsafe - unsized - use - virtual - where - while - yield - - - RunKind - com.barebones.bblm.keyword - - - - Keywords - - blkcnt_t - blksize_t - bool - c_char - c_double - c_float - c_int - c_long - c_schar - c_short - c_uchar - c_uint - c_ulong - c_ushort - char - clock_t - dev_t - f32 - f64 - float - gid_t - i16 - i32 - i64 - i8 - ino_t - isize - mode_t - nlink_t - off_t - pid_t - ptrdiff_t - size_t - str - suseconds_t - time_t - u16 - u32 - u64 - u8 - uid_t - usize - wchar_t - - - RunKind - com.barebones.bblm.predefined-symbol - - - - BBLMLanguageCode - Rust - - BBLMLanguageDisplayName - Rust - - BBLMNonSpellableRunKinds - - com.barebones.bblm.code - com.barebones.bblm.double-string - - - BBLMRunColors - - me.bsago.bblm.rust.function - rgb(219, 135, 2) - - me.bsago.bblm.rust.identifier - rgb(61, 153, 112) - - me.bsago.bblm.rust.lifetime - rgb(133, 20, 75) - - me.bsago.bblm.rust.module - rgb(135, 2, 219) - - - BBLMRunNames - - me.bsago.bblm.rust.function - fn functionname - - me.bsago.bblm.rust.identifier - Identifier - - me.bsago.bblm.rust.lifetime - 'lifetime - - me.bsago.bblm.rust.module - mod modulename - - - BBLMScansFunctions - - - BBLMSpellableRunKinds - - com.barebones.bblm.line-comment - com.barebones.bblm.block-comment - - - BBLMReferenceSearchURLTemplate - https://doc.rust-lang.org/std/?search=__SYMBOLNAME__ - - BBLMSuffixMap - - - BBLMLanguageSuffix - .rs - - BBLMIsSourceKind - - - BBLMIsHeaderKind - - - - - BBLMUseHTMLFileSearchRules - - - - + + BuildMachineOSBuild + 18D109 + CFBundleDevelopmentRegion + English + CFBundleExecutable + Rust + CFBundleIdentifier + me.bsago.bblm.rust + CFBundleInfoDictionaryVersion + 6.0 + CFBundlePackageType + BNDL + CFBundleSignature + BBLM + CFBundleSupportedPlatforms + + MacOSX + + CFBundleVersion + 8.0 + CSResourcesFileMapped + + DTCompiler + com.apple.compilers.llvm.clang.1_0 + DTPlatformBuild + 10B61 + DTPlatformVersion + GM + DTSDKBuild + 18B71 + DTSDKName + macosx10.14 + DTXcode + 1010 + DTXcodeBuild + 10B61 + com.barebones.bblminfo + + + BBLMCanGuessLanguage + + BBLMColorsSyntax + + BBLMCommentLineDefault + // + BBLMCommentPrefixDefault + /* + BBLMCommentSuffixDefault + */ + BBLMDroppedFilePathStyle + POSIX + BBLMEntryPointName + rustMain + BBLMFunctionScannerDoesFoldsToo + + BBLMIsCaseSensitive + + BBLMKeywords + + + Keywords + + abstract + alignof + as + become + box + break + const + continue + crate + do + else + enum + extern + false + final + fn + for + if + impl + in + let + loop + macro + macro_rules + match + mod + move + mut + offsetof + override + priv + proc + pub + pure + ref + return + self + sizeof + static + struct + super + trait + true + type + typeof + unsafe + unsized + use + virtual + where + while + yield + + RunKind + com.barebones.bblm.keyword + + + Keywords + + blkcnt_t + blksize_t + bool + c_char + c_double + c_float + c_int + c_long + c_schar + c_short + c_uchar + c_uint + c_ulong + c_ushort + char + clock_t + dev_t + f32 + f64 + float + gid_t + i16 + i32 + i64 + i8 + ino_t + isize + mode_t + nlink_t + off_t + pid_t + ptrdiff_t + size_t + str + suseconds_t + time_t + u16 + u32 + u64 + u8 + uid_t + usize + wchar_t + + RunKind + com.barebones.bblm.predefined-symbol + + + BBLMLanguageCode + Rust + BBLMLanguageDisplayName + Rust + BBLMNonSpellableRunKinds + + com.barebones.bblm.code + com.barebones.bblm.double-string + + BBLMRunColors + + me.bsago.bblm.rust.function + rgb(219, 135, 2) + me.bsago.bblm.rust.identifier + rgb(61, 153, 112) + me.bsago.bblm.rust.lifetime + rgb(133, 20, 75) + me.bsago.bblm.rust.module + rgb(135, 2, 219) + + BBLMRunNames + + me.bsago.bblm.rust.function + fn functionname + me.bsago.bblm.rust.identifier + Identifier + me.bsago.bblm.rust.lifetime + 'lifetime + me.bsago.bblm.rust.module + mod modulename + + BBLMScansFunctions + + BBLMSpellableRunKinds + + com.barebones.bblm.line-comment + com.barebones.bblm.block-comment + + BBLMSuffixMap + + + BBLMLanguageSuffix + .rs + + + BBLMUseHTMLFileSearchRules + + + + diff --git a/Contents/Language Modules/Rust.bblm/Contents/MacOS/Rust b/Contents/Language Modules/Rust.bblm/Contents/MacOS/Rust index 69bec4e..5eb97ac 100755 Binary files a/Contents/Language Modules/Rust.bblm/Contents/MacOS/Rust and b/Contents/Language Modules/Rust.bblm/Contents/MacOS/Rust differ diff --git a/Contents/Preview Filters/Rust Markdown b/Contents/Preview Filters/Rust Markdown index fd79506..dbe9517 100755 Binary files a/Contents/Preview Filters/Rust Markdown and b/Contents/Preview Filters/Rust Markdown differ diff --git a/Contents/Resources/impl-generator b/Contents/Resources/impl-generator index d107b45..fe69674 100755 Binary files a/Contents/Resources/impl-generator and b/Contents/Resources/impl-generator differ diff --git a/README.md b/README.md index 5656364..4576d6b 100644 --- a/README.md +++ b/README.md @@ -40,7 +40,7 @@ Alternatively, just [download this .zip of the source](https://github.com/ogham/ ### Compilation -To compile your own version, you’ll need Xcode, Rust, and Cargo. The default schema outputs a `.bblm`, and comes with a Run build step so you can debug the module while BBEdit is running. You’ll also need the [BBEdit SDK](http://www.barebones.com/support/develop/). The project assumes it’s mounted under `/Volumes/BBEdit SDK`. +To compile your own version, you’ll need Xcode, Rust, and Cargo. The default schema outputs a `.bblm`, and comes with a Run build step so you can debug the module while BBEdit is running. You’ll also need the [BBEdit SDK](https://github.com/siegel/LanguageModuleSDK). The project assumes it’s available under `${HOME}/Projects/BBEdit/LanguageModuleSDK`. Once you’ve got all that set up, simply run `make` and it’ll compile the language module and Rust helper tools for you. diff --git a/Rust.xcodeproj/project.pbxproj b/Rust.xcodeproj/project.pbxproj index 6588e9e..de9d0d1 100644 --- a/Rust.xcodeproj/project.pbxproj +++ b/Rust.xcodeproj/project.pbxproj @@ -95,13 +95,11 @@ COPY_PHASE_STRIP = NO; INFOPLIST_FILE = Info.plist; INSTALL_MODE_FLAG = "ug+w,o-w,a+rX"; - MACOSX_DEPLOYMENT_TARGET = 10.10; ONLY_ACTIVE_ARCH = YES; OTHER_CFLAGS = ""; PRODUCT_NAME = Rust; SCAN_ALL_SOURCE_FILES_FOR_INCLUDES = YES; - SDKROOT = macosx; - USER_HEADER_SEARCH_PATHS = "/Volumes/BBEdit\\ SDK/Interfaces/Language\\ Modules/"; + USER_HEADER_SEARCH_PATHS = "${HOME}/Projects/BBEdit/LanguageModuleSDK/Interfaces"; WRAPPER_EXTENSION = bblm; }; name = Debug; @@ -113,13 +111,11 @@ COPY_PHASE_STRIP = YES; INFOPLIST_FILE = Info.plist; INSTALL_MODE_FLAG = "ug+w,o-w,a+rX"; - MACOSX_DEPLOYMENT_TARGET = 10.10; ONLY_ACTIVE_ARCH = YES; OTHER_CFLAGS = ""; PRODUCT_NAME = Rust; SCAN_ALL_SOURCE_FILES_FOR_INCLUDES = YES; - SDKROOT = macosx; - USER_HEADER_SEARCH_PATHS = "/Volumes/BBEdit\\ SDK/Interfaces/Language\\ Modules/"; + USER_HEADER_SEARCH_PATHS = "${HOME}/Projects/BBEdit/LanguageModuleSDK/Interfaces"; WRAPPER_EXTENSION = bblm; }; name = Release; @@ -127,23 +123,14 @@ 2E4F91D20863164B009D6578 /* Debug */ = { isa = XCBuildConfiguration; buildSettings = { - ARCHS = "$(ARCHS_STANDARD_32_BIT)"; GCC_TREAT_WARNINGS_AS_ERRORS = YES; - MACOSX_DEPLOYMENT_TARGET = 10.10; - ONLY_ACTIVE_ARCH = YES; - SDKROOT = macosx10.10; - VALID_ARCHS = i386; }; name = Debug; }; 2E4F91D30863164B009D6578 /* Release */ = { isa = XCBuildConfiguration; buildSettings = { - ARCHS = "$(ARCHS_STANDARD_32_BIT)"; GCC_TREAT_WARNINGS_AS_ERRORS = YES; - MACOSX_DEPLOYMENT_TARGET = 10.10; - SDKROOT = macosx10.10; - VALID_ARCHS = i386; }; name = Release; }; diff --git a/helper-tool/Cargo.lock b/helper-tool/Cargo.lock index 75ec032..6f3cad5 100644 --- a/helper-tool/Cargo.lock +++ b/helper-tool/Cargo.lock @@ -1,83 +1,103 @@ -[root] -name = "rust-bbedit-helpers" -version = "0.1.0" -dependencies = [ - "hoedown 3.0.3 (registry+https://github.com/rust-lang/crates.io-index)", - "regex 0.1.41 (registry+https://github.com/rust-lang/crates.io-index)", -] - -[[package]] -name = "advapi32-sys" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -dependencies = [ - "winapi 0.2.5 (registry+https://github.com/rust-lang/crates.io-index)", - "winapi-build 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", -] - [[package]] name = "aho-corasick" -version = "0.3.0" +version = "0.5.3" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "memchr 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)", + "memchr 0.1.11 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] name = "bitflags" -version = "0.3.3" +version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" [[package]] name = "gcc" -version = "0.3.20" +version = "0.3.55" source = "registry+https://github.com/rust-lang/crates.io-index" -dependencies = [ - "advapi32-sys 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", - "winapi 0.2.5 (registry+https://github.com/rust-lang/crates.io-index)", -] [[package]] name = "hoedown" -version = "3.0.3" +version = "3.0.5" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "bitflags 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)", - "gcc 0.3.20 (registry+https://github.com/rust-lang/crates.io-index)", - "libc 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)", + "bitflags 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)", + "gcc 0.3.55 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.49 (registry+https://github.com/rust-lang/crates.io-index)", +] + +[[package]] +name = "kernel32-sys" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ + "winapi 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)", + "winapi-build 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] name = "libc" -version = "0.1.8" +version = "0.2.49" source = "registry+https://github.com/rust-lang/crates.io-index" [[package]] name = "memchr" -version = "0.1.3" +version = "0.1.11" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "libc 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.49 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] name = "regex" -version = "0.1.41" +version = "0.1.80" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "aho-corasick 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)", - "memchr 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)", - "regex-syntax 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", + "aho-corasick 0.5.3 (registry+https://github.com/rust-lang/crates.io-index)", + "memchr 0.1.11 (registry+https://github.com/rust-lang/crates.io-index)", + "regex-syntax 0.3.9 (registry+https://github.com/rust-lang/crates.io-index)", + "thread_local 0.2.7 (registry+https://github.com/rust-lang/crates.io-index)", + "utf8-ranges 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] name = "regex-syntax" -version = "0.2.0" +version = "0.3.9" +source = "registry+https://github.com/rust-lang/crates.io-index" + +[[package]] +name = "rust-bbedit-helpers" +version = "0.1.0" +dependencies = [ + "hoedown 3.0.5 (registry+https://github.com/rust-lang/crates.io-index)", + "regex 0.1.80 (registry+https://github.com/rust-lang/crates.io-index)", +] + +[[package]] +name = "thread-id" +version = "2.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ + "kernel32-sys 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.49 (registry+https://github.com/rust-lang/crates.io-index)", +] + +[[package]] +name = "thread_local" +version = "0.2.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ + "thread-id 2.0.0 (registry+https://github.com/rust-lang/crates.io-index)", +] + +[[package]] +name = "utf8-ranges" +version = "0.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" [[package]] name = "winapi" -version = "0.2.5" +version = "0.2.8" source = "registry+https://github.com/rust-lang/crates.io-index" [[package]] @@ -85,3 +105,18 @@ name = "winapi-build" version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" +[metadata] +"checksum aho-corasick 0.5.3 (registry+https://github.com/rust-lang/crates.io-index)" = "ca972c2ea5f742bfce5687b9aef75506a764f61d37f8f649047846a9686ddb66" +"checksum bitflags 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)" = "4f67931368edf3a9a51d29886d245f1c3db2f1ef0dcc9e35ff70341b78c10d23" +"checksum gcc 0.3.55 (registry+https://github.com/rust-lang/crates.io-index)" = "8f5f3913fa0bfe7ee1fd8248b6b9f42a5af4b9d65ec2dd2c3c26132b950ecfc2" +"checksum hoedown 3.0.5 (registry+https://github.com/rust-lang/crates.io-index)" = "be74c44a242d26d26ea3208a78f52fd7e8eea39ab137be4bd67c67439ac7e5a4" +"checksum kernel32-sys 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)" = "7507624b29483431c0ba2d82aece8ca6cdba9382bff4ddd0f7490560c056098d" +"checksum libc 0.2.49 (registry+https://github.com/rust-lang/crates.io-index)" = "413f3dfc802c5dc91dc570b05125b6cda9855edfaa9825c9849807876376e70e" +"checksum memchr 0.1.11 (registry+https://github.com/rust-lang/crates.io-index)" = "d8b629fb514376c675b98c1421e80b151d3817ac42d7c667717d282761418d20" +"checksum regex 0.1.80 (registry+https://github.com/rust-lang/crates.io-index)" = "4fd4ace6a8cf7860714a2c2280d6c1f7e6a413486c13298bbc86fd3da019402f" +"checksum regex-syntax 0.3.9 (registry+https://github.com/rust-lang/crates.io-index)" = "f9ec002c35e86791825ed294b50008eea9ddfc8def4420124fbc6b08db834957" +"checksum thread-id 2.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "a9539db560102d1cef46b8b78ce737ff0bb64e7e18d35b2a5688f7d097d0ff03" +"checksum thread_local 0.2.7 (registry+https://github.com/rust-lang/crates.io-index)" = "8576dbbfcaef9641452d5cf0df9b0e7eeab7694956dd33bb61515fb8f18cfdd5" +"checksum utf8-ranges 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)" = "a1ca13c08c41c9c3e04224ed9ff80461d97e121589ff27c753a16cb10830ae0f" +"checksum winapi 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)" = "167dc9d6949a9b857f3451275e911c3f44255842c1f7a76f33c55103a909087a" +"checksum winapi-build 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "2d315eee3b34aca4797b2da6b13ed88266e6d612562a0c46390af8299fc699bc"